Next step towards translations

This updates all the ts files and the tx configuration.

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

21 files changed, 20398 insertions, 12531 deletions

diff --git a/.tx/config b/.tx/config
index b6c507efc..73933a21f 100644
--- a/.tx/config
+++ b/.tx/config
@@ -1,14 +1,9 @@
 [main]
 host = https://www.transifex.com
 
-[subsurface.subsurface]
+[subsurface.subsurface4]
 file_filter = translations/susurface_<lang>.ts
 source_file = translations/subsurface_source.ts
 source_lang = en
-type = ts
+type = TS
 
-[subsurface.readme]
-file_filter = l10n/README.<lang>
-source_file = README
-source_lang = en
-type = WIKI
diff --git a/translations/subsurface_bg_BG.ts b/translations/subsurface_bg_BG.ts
index dc714903c..e93361a93 100644
--- a/translations/subsurface_bg_BG.ts
+++ b/translations/subsurface_bg_BG.ts
@@ -2314,42 +2314,135 @@ tranlators here
     </message>
 </context>
 <context>
+    <name>CSVImportDialog</name>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <source>Import File (CSV)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <source>Field Separator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <source>Field Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <source>Time</source>
+        <translation type="unfinished">Време</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <source>Depth</source>
+        <translation type="unfinished">Дълбочина</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <source>Temp</source>
+        <translation type="unfinished">Температура</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
+        <source>Po2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <source>Cns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <source>Stopdepth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <source>Pre-configured imports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>Open CSV Log File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>CSV Files (*.csv)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
         <translation type="unfinished">Тип</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
         <translation type="unfinished">Големина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="65"/>
+        <source>Switch at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="163"/>
+        <source>Clicking here will remove this cylinder.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="385"/>
+        <source>Cylinder cannot be removed</source>
+        <translation type="unfinished"></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>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
@@ -2373,30 +2466,35 @@ tranlators here
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Device ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Model</source>
         <translation type="unfinished">Модел</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
         <translation type="unfinished">Прякор</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <source>Clicking here will remove this divecomputer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1009"/>
+        <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1011"/>
+        <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2404,186 +2502,206 @@ tranlators here
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="39"/>
+        <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="398"/>
+        <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="399"/>
+        <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="400"/>
-        <source>collapse</source>
+        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <source>collapse others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="402"/>
-        <source>remove dive from trip</source>
+        <location filename="../qt-ui/divelistview.cpp" line="638"/>
+        <source>remove dive(s) from trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="405"/>
-        <source>Merge trip with trip above</source>
-        <translation type="unfinished">Слей пътуване с горно пътуване</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="639"/>
+        <source>create new trip above</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="406"/>
-        <source>Merge trip with trip below</source>
-        <translation type="unfinished">Слей пътуване с долно пътуване</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="640"/>
+        <source>add dive(s) to trip immideately above</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="410"/>
-        <source>delete dive</source>
+        <location filename="../qt-ui/divelistview.cpp" line="643"/>
+        <source>merge trip with trip above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="412"/>
-        <source>merge selected dives</source>
+        <location filename="../qt-ui/divelistview.cpp" line="644"/>
+        <source>merge trip with trip below</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../qt-ui/divelistview.cpp" line="648"/>
+        <source>delete dive(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
-        <source>Bottom SAC</source>
+        <location filename="../qt-ui/divelistview.cpp" line="652"/>
+        <source>save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
-        <source>High GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="653"/>
+        <source>export As UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
-        <source>SAC on DECO Stop</source>
+        <location filename="../qt-ui/divelistview.cpp" line="654"/>
+        <source>shift times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
-        <source>Low GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
+        <source>Save Dives As...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="114"/>
-        <source>Last Stop at 6m</source>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
+        <source>Save File as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="141"/>
-        <source>Start Time</source>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="148"/>
-        <source>ATM Pressure</source>
+        <source>Merge trip with trip above</source>
+        <translation type="obsolete">Слей пътуване с горно пътуване</translation>
+    </message>
+    <message>
+        <source>Merge trip with trip below</source>
+        <translation type="obsolete">Слей пътуване с долно пътуване</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <source>merge selected dives</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DivePlannerGraphics</name>
+    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="143"/>
-        <source>10m</source>
+        <location filename="../qt-ui/diveplanner.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="145"/>
-        <source>30ft</source>
+        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <source>Bottom SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="146"/>
-        <source>Increase maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <source>SAC on DECO Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="147"/>
-        <source>Decreases maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <source>Increase minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>10min</source>
+        <location filename="../qt-ui/diveplanner.ui" line="108"/>
+        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>Decreases minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <source>Last Stop at 6m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
-        <source>Handler Position Error</source>
+        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="386"/>
-        <source>One or more of your stops will be lost with this operations, 
-Please, remove them first.</source>
+        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <source>ATM Pressure</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DivePlannerGraphics</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <source>10m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="136"/>
+        <source>30ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <source>Handler Position Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="415"/>
-        <source>Air</source>
+        <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>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="420"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="421"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="424"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="425"/>
-        <source>Air</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <source>AIR</source>
+        <translation type="unfinished">Въздух</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="986"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="987"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
         <translation type="unfinished">Продълж. (мин.)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="988"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="989"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1141"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1142"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2591,75 +2709,85 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="851"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="937"/>
+        <source>Available Gases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <source>add dive data point</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1051"/>
+        <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
         <translation type="unfinished">№</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1052"/>
+        <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
         <translation type="unfinished">Дата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
         <translation type="unfinished">м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
         <translation type="unfinished">фута</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1055"/>
+        <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
         <translation type="unfinished">мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
         <translation type="unfinished">кг</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
         <translation type="unfinished">паунда</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1058"/>
+        <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
         <translation type="unfinished">Водолазен костюм</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1059"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
         <translation type="unfinished">Бут.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1061"/>
+        <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
         <translation type="unfinished">SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1062"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1063"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
         <translation type="unfinished">макс CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1064"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
         <translation type="unfinished">Местонахождение</translation>
     </message>
@@ -2667,14 +2795,20 @@ Please, remove them first.</source>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="138"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
         <translation type="unfinished">Грешка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="142"/>
-        <source>retry</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
+        <source>Retry</source>
+        <translation type="unfinished">Опитай пак</translation>
     </message>
 </context>
 <context>
@@ -2734,6 +2868,7 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
         <translation type="unfinished">Бележки</translation>
     </message>
@@ -2748,225 +2883,238 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <source>M/d/yy h:mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="108"/>
-        <location filename="../qt-ui/maintab.cpp" line="307"/>
+        <location filename="../qt-ui/maintab.ui" line="112"/>
+        <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
         <translation type="unfinished">Местонахождение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="122"/>
+        <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="136"/>
+        <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
         <translation type="unfinished">Водач</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="143"/>
+        <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
         <translation type="unfinished">Партньор</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="166"/>
+        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
         <translation type="unfinished">Оценка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="173"/>
+        <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
         <translation type="unfinished">Видимост</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="182"/>
+        <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
         <translation type="unfinished">Водолазен костюм</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="206"/>
-        <location filename="../qt-ui/maintab.cpp" line="308"/>
+        <location filename="../qt-ui/maintab.ui" line="217"/>
+        <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
         <translation type="unfinished">Бележки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="232"/>
+        <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
         <translation type="unfinished">Екипировка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="319"/>
+        <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
         <translation type="unfinished">Информация</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="361"/>
+        <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
         <translation type="unfinished">Дата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="380"/>
+        <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="399"/>
+        <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="418"/>
+        <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="437"/>
-        <location filename="../qt-ui/maintab.ui" line="692"/>
+        <location filename="../qt-ui/maintab.ui" line="466"/>
+        <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
         <translation type="unfinished">SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="456"/>
+        <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="475"/>
+        <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="494"/>
+        <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="513"/>
+        <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="532"/>
+        <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="551"/>
+        <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="570"/>
+        <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
         <translation type="unfinished">Време</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="589"/>
+        <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
         <translation type="unfinished">Статистики</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="668"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation type="unfinished">Дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="680"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation type="unfinished">Температура:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="704"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation type="unfinished">Продълж. (мин.)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="716"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation type="unfinished">Общо време</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="735"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation type="unfinished">Гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="68"/>
+        <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
         <translation type="unfinished">Бутилки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="129"/>
-        <location filename="../qt-ui/maintab.cpp" line="131"/>
-        <source>This trip is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <source>Trip Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="137"/>
-        <location filename="../qt-ui/maintab.cpp" line="139"/>
-        <source>This dive is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="296"/>
+        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <source>Trip Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="286"/>
-        <source>Trip Location</source>
+        <location filename="../qt-ui/maintab.cpp" line="134"/>
+        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="288"/>
-        <source>Trip Notes</source>
+        <location filename="../qt-ui/maintab.cpp" line="143"/>
+        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
-        <location filename="../qt-ui/maintab.cpp" line="337"/>
-        <location filename="../qt-ui/maintab.cpp" line="338"/>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="146"/>
+        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <source>This dive is being edited. Select Save or Cancel when done.</source>
+        <translation type="unfinished"></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"/>
         <source>/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <source>unknown</source>
+        <translation type="unfinished">неизвестно</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
         <translation type="unfinished">С</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
         <translation type="unfinished">Ю</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
         <translation type="unfinished">И</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
         <translation type="unfinished">З</translation>
     </message>
@@ -2979,308 +3127,432 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="177"/>
         <source>File</source>
-        <translation type="unfinished">Файл</translation>
+        <translation type="obsolete">Файл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="196"/>
         <source>Log</source>
-        <translation type="unfinished">Регистър</translation>
+        <translation type="obsolete">Регистър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="211"/>
         <source>View</source>
-        <translation type="unfinished">Изглед</translation>
+        <translation type="obsolete">Изглед</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="226"/>
+        <location filename="../qt-ui/mainwindow.ui" line="218"/>
         <source>Filter</source>
         <translation type="unfinished">Филтър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="232"/>
         <source>Help</source>
-        <translation type="unfinished">Помощ</translation>
+        <translation type="obsolete">Помощ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="245"/>
+        <location filename="../qt-ui/mainwindow.ui" line="177"/>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <source>&amp;Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <source>&amp;View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <source>&amp;Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>&amp;New logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
         <translation type="unfinished">Нов</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <source>&amp;Open logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="256"/>
+        <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
+        <location filename="../qt-ui/mainwindow.ui" line="281"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation type="unfinished">Запиши като...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
+        <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="277"/>
+        <location filename="../qt-ui/mainwindow.ui" line="292"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation type="unfinished">Затвори</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="285"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="176"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <source>Export UDDF</source>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <source>Export &amp;UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
-        <source>Print</source>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <source>Ctrl+U</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="301"/>
-        <source>Ctrl+P</source>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <source>&amp;Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
-        <source>Preferences</source>
-        <translation type="unfinished">Настройки</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <source>Ctrl+,</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="311"/>
-        <source>Quit</source>
-        <translation type="unfinished">Изход</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
-        <source>Ctrl+Q</source>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <source>Import from &amp;dive computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <source>Download from Dive computer</source>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
-        <source>Ctrl+D</source>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <source>Ctrl+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="327"/>
-        <source>Download from Web Service</source>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <source>&amp;Edit Device Names</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="332"/>
-        <source>Edit Device Names</source>
-        <translation type="unfinished">Редактирай имена на устройства</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <source>Ctrl++</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="337"/>
-        <source>Add Dive</source>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <source>&amp;Renumber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
-        <source>Renumber</source>
-        <translation type="unfinished">Преномерирай</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Ctrl+R</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
-        <source>Auto Group</source>
+        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <source>Toggle &amp;Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
-        <source>Toggle Zoom</source>
-        <translation type="unfinished">Превключване на зуум</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <source>&amp;Yearly Statistics</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
-        <source>Yearly Statistics</source>
-        <translation type="unfinished">Годишни статистики</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <source>Ctrl+Y</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
-        <source>View List</source>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Dive List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="365"/>
-        <source>Ctrl+2</source>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <source>Profile</source>
+        <translation type="unfinished">Профил</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <source>Info</source>
+        <translation type="unfinished">Информация</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
-        <source>View Profile</source>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <source>User &amp;Manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="373"/>
-        <source>Ctrl+3</source>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <source>Globe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
-        <source>View Info</source>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <source>P&amp;lan Dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="381"/>
-        <source>Ctrl+4</source>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <source>Ctrl+L</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <source>Import CSV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <source>Import CS&amp;V</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <source>Import from Divelogs.de</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <source>Preferences</source>
+        <translation type="unfinished">Настройки</translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="obsolete">Изход</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <source>Ctrl+D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Device Names</source>
+        <translation type="obsolete">Редактирай имена на устройства</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <source>Add Dive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Renumber</source>
+        <translation type="obsolete">Преномерирай</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/mainwindow.ui" line="386"/>
-        <source>View All</source>
+        <source>Auto Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="389"/>
+        <source>Toggle Zoom</source>
+        <translation type="obsolete">Превключване на зуум</translation>
+    </message>
+    <message>
+        <source>Yearly Statistics</source>
+        <translation type="obsolete">Годишни статистики</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <source>Ctrl+2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <source>Ctrl+3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <source>Ctrl+4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>Ctrl+1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Prev DC</source>
         <translation type="unfinished">Предишен ГК</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
+        <location filename="../qt-ui/mainwindow.ui" line="439"/>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="402"/>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Next DC</source>
         <translation type="unfinished">Следващ ГК</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="405"/>
+        <location filename="../qt-ui/mainwindow.ui" line="447"/>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="410"/>
+        <location filename="../qt-ui/mainwindow.ui" line="452"/>
         <source>Select Events</source>
         <translation type="unfinished">Избери събития</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
         <source>Input Plan</source>
         <translation type="unfinished">Въведи план</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
         <source>About Subsurface</source>
         <translation type="unfinished">За Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>User Manual</source>
-        <translation type="unfinished">Ръководство за потребителя</translation>
+        <translation type="obsolete">Ръководство за потребителя</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>F1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="433"/>
-        <source>View Globe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="478"/>
         <source>Ctrl+5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="441"/>
-        <source>Dive Planner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="108"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Open File</source>
         <translation type="unfinished">Отвори файл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="271"/>
-        <source>manually added dive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="448"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="450"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="455"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
         <translation type="unfinished">Запиши промените?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="456"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="695"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="696"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="144"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="250"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="286"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="197"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3343,215 +3615,235 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="218"/>
+        <location filename="../qt-ui/preferences.ui" line="199"/>
+        <source>Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="205"/>
+        <source>Use Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="225"/>
+        <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="235"/>
+        <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="245"/>
+        <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="269"/>
+        <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
         <translation type="unfinished">Дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="276"/>
+        <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
         <translation type="unfinished">Метра</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="286"/>
+        <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
         <translation type="unfinished">Фута</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
         <translation type="unfinished">Налягане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="303"/>
+        <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
         <translation type="unfinished">Бара</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="313"/>
+        <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="330"/>
+        <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
         <translation type="unfinished">Литра</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="340"/>
+        <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
         <translation type="unfinished">Кб.Фута</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="350"/>
+        <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
         <translation type="unfinished">Температура:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="357"/>
+        <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
         <translation type="unfinished">Целзии</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
         <translation type="unfinished">Фаренхайт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="377"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
         <translation type="unfinished">Тежест</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
         <translation type="unfinished">паунда</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="464"/>
+        <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="472"/>
+        <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="495"/>
-        <location filename="../qt-ui/preferences.ui" line="536"/>
-        <location filename="../qt-ui/preferences.ui" line="577"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="513"/>
+        <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="554"/>
+        <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="595"/>
+        <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="618"/>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="634"/>
+        <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="643"/>
+        <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="666"/>
+        <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="677"/>
+        <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="700"/>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="710"/>
+        <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="721"/>
-        <source>Show time</source>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
+        <source>Calculate NDL/TTS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="733"/>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>Show SAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
+        <source>GFLow at max depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="739"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
-        <source>XML Files (*.xml)</source>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3689,51 +3981,86 @@ Please, remove them first.</source>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="257"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="259"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <source>Hide events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <source>Hide all %1 events?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <source>Remove the selected event?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <source>%1 @ %2:%3</source>
+        <translation type="unfinished"></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>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="337"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="383"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="384"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="582"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="850"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <source>Measure properties of dive segments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
+        <source>Scale your dive to screen size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
+        <source>Edit</source>
+        <translation type="unfinished">Редактирай</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
         <translation type="unfinished">въздух</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="584"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="851"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="859"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
         <translation type="unfinished">Връщане към OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="861"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished"> начало</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="862"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished"> край</translation>
@@ -3742,62 +4069,62 @@ Please, remove them first.</source>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1497"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
         <translation type="unfinished">неизвестно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1502"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1505"/>
+        <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1512"/>
+        <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1517"/>
+        <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
         <translation type="unfinished">Бутилка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1519"/>
+        <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
         <translation type="unfinished">Газ микс</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1547"/>
+        <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
         <translation type="unfinished">SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1549"/>
+        <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
         <translation type="unfinished">Макс. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1551"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1564"/>
+        <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1570"/>
+        <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3806,30 +4133,30 @@ Please, remove them first.</source>
     <name>QObject</name>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="44"/>
         <source>AIR</source>
         <translation type="unfinished">Въздух</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="38"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="45"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="723"/>
+        <source>Remove this Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>EAN32</source>
-        <translation type="unfinished">EAN32</translation>
+        <translation type="obsolete">EAN32</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="46"/>
         <source>EAN36</source>
-        <translation type="unfinished">EAN36</translation>
+        <translation type="obsolete">EAN36</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="47"/>
-        <source>Choose Gas</source>
+        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <source>No location data - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="188"/>
-        <source>No location data - move the map and double-click to set the dive location</source>
+        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3838,17 +4165,17 @@ Please, remove them first.</source>
         <translation type="unfinished">Затвори</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="26"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation type="unfinished">Средно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="29"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation type="unfinished">Минимум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation type="unfinished">Максимум</translation>
     </message>
@@ -3867,92 +4194,95 @@ Please, remove them first.</source>
     </message>
 </context>
 <context>
-    <name>SubsurfaceAbout</name>
+    <name>ShiftTimesDialog</name>
     <message>
-        <location filename="../qt-ui/about.ui" line="23"/>
-        <source>About Subsurface</source>
-        <translation type="unfinished">За Subsurface</translation>
+        <location filename="../qt-ui/shifttimes.ui" line="14"/>
+        <source>Shift selected times</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
+        <location filename="../qt-ui/shifttimes.ui" line="35"/>
+        <source>Shift times of selected dives by</source>
         <translation type="unfinished"></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>
+        <location filename="../qt-ui/shifttimes.ui" line="80"/>
+        <source>h:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="22"/>
-        <source>&amp;License</source>
+        <location filename="../qt-ui/shifttimes.ui" line="90"/>
+        <source>earlier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
-        <source>&amp;Website</source>
+        <location filename="../qt-ui/shifttimes.ui" line="97"/>
+        <source>later</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SubsurfaceWebServices</name>
+    <name>SubsurfaceAbout</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="14"/>
-        <source>Download Location Data</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/about.ui" line="23"/>
+        <source>About Subsurface</source>
+        <translation type="unfinished">За Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="37"/>
-        <source>Download</source>
+        <location filename="../qt-ui/about.ui" line="64"/>
+        <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="44"/>
-        <source>Enter your ID here</source>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="51"/>
-        <source>User ID</source>
+        <location filename="../qt-ui/about.cpp" line="22"/>
+        <source>&amp;License</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="58"/>
-        <source>Status:</source>
+        <location filename="../qt-ui/about.cpp" line="23"/>
+        <source>&amp;Website</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="49"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
         <translation type="unfinished">Уеб услуга</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="90"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="106"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="130"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
         <translation type="unfinished">Грешка при връзка: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
         <translation type="unfinished">Грешен потребителски ключ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
         <translation type="unfinished">Не може да бъде напревен разряд!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="133"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
         <translation type="unfinished">Успешно изтегляне!</translation>
     </message>
@@ -3973,17 +4303,17 @@ Please, remove them first.</source>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Bar</source>
         <translation type="unfinished">Бара</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3991,7 +4321,7 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1393"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3999,96 +4329,139 @@ Please, remove them first.</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>kg</source>
         <translation type="unfinished">кг</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>WebServices</name>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="14"/>
+        <source>Download Location Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="20"/>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="27"/>
+        <source>Enter your ID here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="34"/>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="58"/>
+        <source>User ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="72"/>
+        <source>Password</source>
+        <translation type="unfinished">Парола</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="86"/>
+        <source>Upload</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
         <translation type="unfinished">Тип</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
         <translation type="unfinished">Тежест</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="460"/>
+        <source>Clicking here will remove this weigthsystem.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
- &gt; Month</source>
+ &gt; Month / Trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
         <translation type="unfinished">№</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1307"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1310"/>
+        <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1311"/>
+        <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1312"/>
-        <location filename="../qt-ui/models.cpp" line="1315"/>
-        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <location filename="../qt-ui/models.cpp" line="1418"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1313"/>
-        <location filename="../qt-ui/models.cpp" line="1316"/>
-        <location filename="../qt-ui/models.cpp" line="1319"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"></translation>
@@ -4097,91 +4470,74 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="44"/>
+        <location filename="../dive.c" line="57"/>
         <source>pascal</source>
         <translation type="unfinished">паскала</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="48"/>
-        <location filename="../qt-gui.cpp" line="323"/>
+        <location filename="../dive.c" line="61"/>
+        <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
         <translation type="unfinished">бара</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="52"/>
-        <location filename="../qt-gui.cpp" line="326"/>
+        <location filename="../dive.c" line="65"/>
+        <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
         <translation type="unfinished">psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="88"/>
-        <location filename="../qt-gui.cpp" line="304"/>
+        <location filename="../dive.c" line="101"/>
+        <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
         <translation type="unfinished">л</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="93"/>
-        <location filename="../qt-gui.cpp" line="307"/>
+        <location filename="../dive.c" line="106"/>
+        <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
         <translation type="unfinished">кб.фута</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="121"/>
-        <location filename="../qt-gui.cpp" line="207"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
         <translation type="unfinished">м</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="126"/>
-        <location filename="../qt-gui.cpp" line="210"/>
+        <location filename="../dive.c" line="139"/>
+        <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
         <translation type="unfinished">фута</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="170"/>
-        <location filename="../qt-gui.cpp" line="233"/>
+        <location filename="../dive.c" line="183"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
         <translation type="unfinished">паунда</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
-        <location filename="../qt-gui.cpp" line="231"/>
+        <location filename="../dive.c" line="187"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
         <translation type="unfinished">кг</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="966"/>
+        <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
         <translation type="unfinished">(%s) или (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="473"/>
         <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <translation type="unfinished">%1$s, %3$d %2$s, %4$d %5$02d:%6$02d</translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="490"/>
-        <source>%1$s %2$d, %3$d
-%4$02d:%5$02d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="512"/>
-        <source>%1$s %2$d (%3$d dives)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="519"/>
-        <source>%1$s %2$d (1 dive)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">%1$s, %3$d %2$s, %4$d %5$02d:%6$02d</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="550"/>
-        <location filename="../planner.c" line="94"/>
-        <location filename="../planner.c" line="748"/>
-        <location filename="../planner.c" line="749"/>
-        <location filename="../statistics.c" line="360"/>
-        <location filename="../statistics.c" line="371"/>
+        <location filename="../divelist.c" line="488"/>
+        <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"/>
         <source>air</source>
         <translation type="unfinished">въздух</translation>
     </message>
@@ -4211,312 +4567,324 @@ Maximum</source>
         <translation type="unfinished">щипка</translation>
     </message>
     <message>
-        <location filename="../file.c" line="106"/>
-        <location filename="../file.c" line="108"/>
-        <location filename="../file.c" line="303"/>
-        <location filename="../file.c" line="305"/>
+        <location filename="../file.c" line="107"/>
+        <location filename="../file.c" line="109"/>
+        <location filename="../file.c" line="308"/>
+        <location filename="../file.c" line="310"/>
+        <location filename="../file.c" line="390"/>
+        <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation type="unfinished">Не може да бъде прочетен &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <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>
+    </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>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
         <translation type="unfinished">няма</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
         <translation type="unfinished">деко. стоп</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
         <translation type="unfinished">rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
         <translation type="unfinished">покачване</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
         <translation type="unfinished">таван</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
         <translation type="unfinished">натовареност</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
         <translation type="unfinished">предавател</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
         <translation type="unfinished">нарушение</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
         <translation type="unfinished">бележка</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
         <translation type="unfinished">повърхност</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
         <translation type="unfinished">безопасен стоп</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
         <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
         <translation type="unfinished">смяна на газ</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
         <translation type="unfinished">безопасен стоп (свободен)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
         <translation type="unfinished">безопасен стоп (задължителен)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
         <translation type="unfinished">дълбочина на спиране</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
         <translation type="unfinished">таван (безопасен стоп)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
         <translation type="unfinished">време за гмуркане</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
         <translation type="unfinished">макс. дълбочина</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
         <translation type="unfinished">OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
         <translation type="unfinished">PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
         <translation type="unfinished">време за въздух</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
         <translation type="unfinished">rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
         <translation type="unfinished">посока</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
         <translation type="unfinished">внимание: ниво на тъканта</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
         <translation type="unfinished">нон стоп време</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="157"/>
+        <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
         <translation type="unfinished">грешен номер на събитие</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="390"/>
+        <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
         <translation type="unfinished">Не може да бъде създаден разряд за %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="396"/>
+        <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
         <translation type="unfinished">Грешка при регистриране на данни</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="405"/>
+        <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
         <translation type="unfinished">Грешка при разряд на дата и час</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
         <translation type="unfinished">Гмуркане №%d: %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="427"/>
+        <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
         <translation type="unfinished">Грешка при рaзряд на време за гмуркане</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="437"/>
+        <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
         <translation type="unfinished">Грешка при рaзряд на максимална дълбочина</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="447"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
         <translation type="unfinished">Грешка при рaзряд на газ микс брой</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
         <translation type="unfinished">Грешка при прием на водна соленост</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="469"/>
+        <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
         <translation type="unfinished">Грешка при рaзряд на газ микс</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
         <translation type="unfinished">Грешка при рaзряд на стойности</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="613"/>
+        <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
         <translation type="unfinished">Събитие: изчаквание на действие от потребителя</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="621"/>
+        <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation type="unfinished">model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="663"/>
+        <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
         <translation type="unfinished">Грешка при регистриране на направление за събития</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="668"/>
+        <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished">Грешка при регистриране на направление за отменяне</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="672"/>
+        <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
         <translation type="unfinished">Грешка при вход на данни</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="690"/>
+        <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished">Не може да бъде създаден libdivecomputer контекст</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished">Не може да бъдe отворен %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="549"/>
+        <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
         <translation type="unfinished">Неразпозната стойност за проценти %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1695"/>
+        <location filename="../parse-xml.c" line="1717"/>
         <source>Failed to parse &apos;%s&apos;.
 </source>
         <translation type="unfinished">Не може да бъде напревен разбор на &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1696"/>
+        <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation type="unfinished">Не може да бъде напревен разбор на &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1894"/>
+        <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
         <translation type="unfinished">Базата данни не може да изпълни get_events.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1929"/>
+        <location filename="../parse-xml.c" line="1951"/>
         <source>Database connection failed &apos;%s&apos;.
 </source>
         <translation type="unfinished">Няма връзка към базата данни &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1936"/>
+        <location filename="../parse-xml.c" line="1958"/>
         <source>Database query failed &apos;%s&apos;.
 </source>
         <translation type="unfinished">Грешка при заява към база данни &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2048"/>
+        <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
         <translation type="unfinished">Не може да бъде зареден стилов файл (%s)/%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="96"/>
-        <location filename="../statistics.c" line="363"/>
+        <location filename="../planner.c" line="98"/>
+        <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
         <translation type="unfinished">EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="131"/>
+        <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation type="unfinished">Не може да бъде намерен газ %d/%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="192"/>
         <source>Cylinder for planning</source>
-        <translation type="unfinished">Бутилка за плануване</translation>
+        <translation type="obsolete">Бутилка за плануване</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="217"/>
         <source>Simulated Dive</source>
-        <translation type="unfinished">Симулирано гмуркане</translation>
+        <translation type="obsolete">Симулирано гмуркане</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="294"/>
+        <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
         <translation type="unfinished">Твърде много газови смеси</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="472"/>
+        <location filename="../planner.c" line="493"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -4529,180 +4897,173 @@ Subsurface планиране
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="513"/>
+        <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished">Преход към %.*f %s за %d:%02d мин - времетраене %d:%02u на %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="522"/>
+        <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished">Остани на %.*f %s за %d:%02d мин - времетраене %d:%02u на %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
         <translation type="unfinished">Превключи газ на %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
         <translation type="unfinished">Консумация на газ:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="552"/>
+        <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
         <translation type="unfinished">%.0f%s от %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="776"/>
         <source>ean</source>
         <translation type="unfinished">ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1154"/>
         <source>D:%.1f %s</source>
-        <translation type="unfinished">D:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1158"/>
-        <source>%s
-T:%d:%02d</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">D:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
         <translation type="unfinished">%s
 P:%d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
         <translation type="unfinished">%s
 T:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1177"/>
+        <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation type="unfinished">%s
 таван %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1189"/>
+        <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation type="unfinished">%s
 Стоп:%uмин @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1199"/>
+        <source>@:%d:%02d
+D:%.1f %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1219"/>
+        <source>%s
+SAC:%2.1fl/min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation type="unfinished">%s
 Стоп:неопр. време @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation type="unfinished">%s
 Деко:%uмин @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1211"/>
+        <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation type="unfinished">%s
 Деко:неопр. време @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1217"/>
+        <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
         <translation type="unfinished">%s
 В деко</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
-        <source>%s
-NDL:-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1275"/>
         <source>%s
 NDL:%umin</source>
         <translation type="unfinished">%s
 NDL:%umin</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
-        <source>%s
-TTS:%umin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1223"/>
         <source>%s
 CNS:%u%%</source>
         <translation type="unfinished">%s
 CNS:%u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1227"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation type="unfinished">%s
 pO%s:%.2fбара</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1231"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation type="unfinished">%s
 pN%s:%.2fбара</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1243"/>
+        <location filename="../profile.c" line="1235"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation type="unfinished">%s
 pHe:%.2fбара</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1240"/>
         <source>%s
 MOD:%d%s</source>
         <translation type="unfinished">%s
 MOD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1247"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -4713,295 +5074,346 @@ END:%d%s
 EADD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1349"/>
+        <location filename="../profile.c" line="1280"/>
+        <source>%s
+Deco:%umin @ %.0f %s (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1289"/>
+        <source>%s
+In deco (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>%s
+NDL:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1296"/>
+        <source>%s
+TTS:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
-        <location filename="../profile.c" line="1357"/>
+        <location filename="../profile.c" line="1409"/>
+        <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1361"/>
+        <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1365"/>
+        <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1369"/>
-        <source>%s%sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1425"/>
+        <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1373"/>
-        <location filename="../profile.c" line="1377"/>
-        <source>%s %sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1429"/>
+        <location filename="../profile.c" line="1433"/>
+        <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1384"/>
+        <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="284"/>
+        <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="288"/>
+        <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../qt-gui.cpp" line="460"/>
+        <source>%1, %2 %3, %4 %5:%6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="473"/>
+        <source>%1 %2, %3
+%4:%5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="486"/>
+        <source>%1 %2 (%3 dives)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="491"/>
+        <source>%1 %2 (1 dive)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>invalid</source>
-        <translation type="unfinished">невалидно</translation>
+        <translation type="obsolete">невалидно</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>boat</source>
         <translation type="unfinished">кораб</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>shore</source>
         <translation type="unfinished">бряг</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>drift</source>
         <translation type="unfinished">дрейф</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>deep</source>
         <translation type="unfinished">дълбоко</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>cavern</source>
         <translation type="unfinished">каверна</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="14"/>
         <source>ice</source>
         <translation type="unfinished">лед</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>wreck</source>
         <translation type="unfinished">останки</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>cave</source>
         <translation type="unfinished">пещера</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>altitude</source>
         <translation type="unfinished">височина</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>pool</source>
         <translation type="unfinished">басейн</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>lake</source>
         <translation type="unfinished">езеро</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="16"/>
         <source>river</source>
         <translation type="unfinished">река</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="17"/>
         <source>night</source>
         <translation type="unfinished">вечер</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="17"/>
+        <source>fresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="17"/>
+        <source>student</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>freshwater</source>
-        <translation type="unfinished">сладководно</translation>
+        <translation type="obsolete">сладководно</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
         <source>training</source>
-        <translation type="unfinished">тренировъчно</translation>
+        <translation type="obsolete">тренировъчно</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
         <source>teaching</source>
-        <translation type="unfinished">учебно</translation>
+        <translation type="obsolete">учебно</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
         <source>photo</source>
         <translation type="unfinished">снимка</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
         <source>video</source>
         <translation type="unfinished">видео</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
+        <source>instructor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="19"/>
         <source>deco</source>
         <translation type="unfinished">деко</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="199"/>
+        <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
         <translation type="unfinished">повече от %d дни</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="205"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation type="unfinished">%dд %dч %dмин</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="207"/>
+        <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
         <translation type="unfinished">%dч %dмин</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="218"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation type="unfinished">за гмуркания №</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="225"/>
+        <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
         <translation type="unfinished">за избраните гмуркания</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="260"/>
+        <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
         <translation type="unfinished">за гмуркане №%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="262"/>
+        <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
         <translation type="unfinished">за избраните гмуркане</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="264"/>
+        <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
         <translation type="unfinished">за вички гмуркания</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="266"/>
+        <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
         <translation type="unfinished">(няма гмуркания)</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="363"/>
-        <source>, EAN%d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
         <translation type="unfinished">Нед</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
         <translation type="unfinished">Пон</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
         <translation type="unfinished">Вт</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
         <translation type="unfinished">Ср</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
         <translation type="unfinished">Чет</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
         <translation type="unfinished">Пет</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
         <translation type="unfinished">Съб</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
         <translation type="unfinished">Ян</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
         <translation type="unfinished">Фев</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
         <translation type="unfinished">Март</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
         <translation type="unfinished">Апр</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
         <translation type="unfinished">Май</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
         <translation type="unfinished">Юни</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
         <translation type="unfinished">Юли</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
         <translation type="unfinished">Авг</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
         <translation type="unfinished">Сеп</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
         <translation type="unfinished">Окт</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
         <translation type="unfinished">Нов</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
         <translation type="unfinished">Дек</translation>
     </message>
diff --git a/translations/subsurface_ca_ES.ts b/translations/subsurface_ca_ES.ts
index ed09b9ac9..ad61aefca 100644
--- a/translations/subsurface_ca_ES.ts
+++ b/translations/subsurface_ca_ES.ts
@@ -2,42 +2,135 @@
 <!DOCTYPE TS>
 <TS version="2.0" language="es_ES">
 <context>
+    <name>CSVImportDialog</name>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <source>Import File (CSV)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <source>Field Separator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <source>Field Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <source>Depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <source>Temp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
+        <source>Po2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <source>Cns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <source>Stopdepth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <source>Pre-configured imports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>Open CSV Log File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>CSV Files (*.csv)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="65"/>
+        <source>Switch at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="163"/>
+        <source>Clicking here will remove this cylinder.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="385"/>
+        <source>Cylinder cannot be removed</source>
+        <translation type="unfinished"></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>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
@@ -61,30 +154,35 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Device ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Model</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <source>Clicking here will remove this divecomputer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1009"/>
+        <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1011"/>
+        <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
         <translation type="unfinished"></translation>
     </message>
@@ -92,186 +190,198 @@
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="39"/>
+        <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="398"/>
+        <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="399"/>
+        <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="400"/>
-        <source>collapse</source>
+        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <source>collapse others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="402"/>
-        <source>remove dive from trip</source>
+        <location filename="../qt-ui/divelistview.cpp" line="638"/>
+        <source>remove dive(s) from trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="405"/>
-        <source>Merge trip with trip above</source>
+        <location filename="../qt-ui/divelistview.cpp" line="639"/>
+        <source>create new trip above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="406"/>
-        <source>Merge trip with trip below</source>
+        <location filename="../qt-ui/divelistview.cpp" line="640"/>
+        <source>add dive(s) to trip immideately above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="410"/>
-        <source>delete dive</source>
+        <location filename="../qt-ui/divelistview.cpp" line="643"/>
+        <source>merge trip with trip above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="412"/>
-        <source>merge selected dives</source>
+        <location filename="../qt-ui/divelistview.cpp" line="644"/>
+        <source>merge trip with trip below</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../qt-ui/divelistview.cpp" line="648"/>
+        <source>delete dive(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
-        <source>Bottom SAC</source>
+        <location filename="../qt-ui/divelistview.cpp" line="652"/>
+        <source>save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
-        <source>High GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="653"/>
+        <source>export As UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
-        <source>SAC on DECO Stop</source>
+        <location filename="../qt-ui/divelistview.cpp" line="654"/>
+        <source>shift times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
-        <source>Low GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
+        <source>Save Dives As...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="114"/>
-        <source>Last Stop at 6m</source>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
+        <source>Save File as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="141"/>
-        <source>Start Time</source>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="148"/>
-        <source>ATM Pressure</source>
+        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <source>merge selected dives</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DivePlannerGraphics</name>
+    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="143"/>
-        <source>10m</source>
+        <location filename="../qt-ui/diveplanner.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="145"/>
-        <source>30ft</source>
+        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <source>Bottom SAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <source>SAC on DECO Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="146"/>
-        <source>Increase maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="147"/>
-        <source>Decreases maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="108"/>
+        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <source>Increase minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <source>Last Stop at 6m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>10min</source>
+        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>Decreases minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <source>ATM Pressure</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DivePlannerGraphics</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
-        <source>Handler Position Error</source>
+        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <source>10m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="386"/>
-        <source>One or more of your stops will be lost with this operations, 
-Please, remove them first.</source>
+        <location filename="../qt-ui/diveplanner.cpp" line="136"/>
+        <source>30ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <source>Handler Position Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="415"/>
-        <source>Air</source>
+        <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>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="420"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="421"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="424"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="425"/>
-        <source>Air</source>
+        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <source>AIR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="986"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="987"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="988"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="989"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1141"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1142"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -279,75 +389,85 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="851"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="937"/>
+        <source>Available Gases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <source>add dive data point</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1051"/>
+        <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1052"/>
+        <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1055"/>
+        <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1058"/>
+        <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1059"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1061"/>
+        <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1062"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1063"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1064"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
@@ -355,13 +475,19 @@ Please, remove them first.</source>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="138"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="142"/>
-        <source>retry</source>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
+        <source>Retry</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -422,6 +548,7 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -436,225 +563,238 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <source>M/d/yy h:mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="108"/>
-        <location filename="../qt-ui/maintab.cpp" line="307"/>
+        <location filename="../qt-ui/maintab.ui" line="112"/>
+        <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="122"/>
+        <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="136"/>
+        <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="143"/>
+        <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="166"/>
+        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="173"/>
+        <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="182"/>
+        <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="206"/>
-        <location filename="../qt-ui/maintab.cpp" line="308"/>
+        <location filename="../qt-ui/maintab.ui" line="217"/>
+        <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="232"/>
+        <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="319"/>
+        <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="361"/>
+        <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="380"/>
+        <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="399"/>
+        <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="418"/>
+        <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="437"/>
-        <location filename="../qt-ui/maintab.ui" line="692"/>
+        <location filename="../qt-ui/maintab.ui" line="466"/>
+        <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="456"/>
+        <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="475"/>
+        <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="494"/>
+        <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="513"/>
+        <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="532"/>
+        <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="551"/>
+        <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="570"/>
+        <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="589"/>
+        <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="668"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="680"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="704"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="716"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="735"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="68"/>
+        <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="129"/>
-        <location filename="../qt-ui/maintab.cpp" line="131"/>
-        <source>This trip is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <source>Trip Location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="296"/>
+        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <source>Trip Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="137"/>
-        <location filename="../qt-ui/maintab.cpp" line="139"/>
-        <source>This dive is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="134"/>
+        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="286"/>
-        <source>Trip Location</source>
+        <location filename="../qt-ui/maintab.cpp" line="143"/>
+        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="288"/>
-        <source>Trip Notes</source>
+        <location filename="../qt-ui/maintab.cpp" line="146"/>
+        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <source>This dive is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
-        <location filename="../qt-ui/maintab.cpp" line="337"/>
-        <location filename="../qt-ui/maintab.cpp" line="338"/>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <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"/>
         <source>/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <source>unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
@@ -667,308 +807,392 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="218"/>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../qt-ui/mainwindow.ui" line="177"/>
-        <source>File</source>
+        <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="196"/>
-        <source>Log</source>
+        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <source>&amp;Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="211"/>
-        <source>View</source>
+        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="226"/>
-        <source>Filter</source>
+        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="232"/>
-        <source>Help</source>
+        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <source>&amp;Import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="245"/>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>&amp;New logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <source>&amp;Open logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="256"/>
+        <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
+        <location filename="../qt-ui/mainwindow.ui" line="281"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
+        <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="277"/>
+        <location filename="../qt-ui/mainwindow.ui" line="292"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="285"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="176"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <source>Export UDDF</source>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <source>Export &amp;UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
-        <source>Print</source>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <source>Ctrl+U</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="301"/>
-        <source>Ctrl+P</source>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <source>&amp;Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
-        <source>Preferences</source>
+        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <source>Ctrl+,</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="311"/>
-        <source>Quit</source>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
-        <source>Ctrl+Q</source>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <source>Import from &amp;dive computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <source>Download from Dive computer</source>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
-        <source>Ctrl+D</source>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <source>Ctrl+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="327"/>
-        <source>Download from Web Service</source>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <source>&amp;Edit Device Names</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="332"/>
-        <source>Edit Device Names</source>
+        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <source>Ctrl++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="337"/>
-        <source>Add Dive</source>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <source>&amp;Renumber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
-        <source>Renumber</source>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Ctrl+R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
-        <source>Auto Group</source>
+        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <source>Toggle &amp;Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
-        <source>Toggle Zoom</source>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <source>&amp;Yearly Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
-        <source>Yearly Statistics</source>
+        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <source>Ctrl+Y</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
-        <source>View List</source>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Dive List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="365"/>
-        <source>Ctrl+2</source>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
-        <source>View Profile</source>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="373"/>
-        <source>Ctrl+3</source>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
-        <source>View Info</source>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <source>User &amp;Manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="381"/>
-        <source>Ctrl+4</source>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <source>Globe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="386"/>
-        <source>View All</source>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <source>P&amp;lan Dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="389"/>
-        <source>Ctrl+1</source>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <source>Ctrl+L</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
-        <source>Prev DC</source>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <source>Import CSV</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
-        <source>Left</source>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <source>Import CS&amp;V</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="402"/>
-        <source>Next DC</source>
+        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <source>Import from Divelogs.de</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="405"/>
-        <source>Right</source>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <source>Ctrl+P</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="410"/>
-        <source>Select Events</source>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
-        <source>Input Plan</source>
+        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
-        <source>About Subsurface</source>
+        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <source>Ctrl+D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="425"/>
-        <source>User Manual</source>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <source>Add Dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
-        <source>F1</source>
+        <location filename="../qt-ui/mainwindow.ui" line="386"/>
+        <source>Auto Group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <source>Ctrl+2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <source>Ctrl+3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <source>Ctrl+4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="433"/>
-        <source>View Globe</source>
+        <location filename="../qt-ui/mainwindow.ui" line="431"/>
+        <source>Ctrl+1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="436"/>
-        <source>Ctrl+5</source>
+        <source>Prev DC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="441"/>
-        <source>Dive Planner</source>
+        <location filename="../qt-ui/mainwindow.ui" line="439"/>
+        <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="108"/>
-        <source>Open File</source>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
+        <source>Next DC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="447"/>
+        <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="271"/>
-        <source>manually added dive</source>
+        <location filename="../qt-ui/mainwindow.ui" line="452"/>
+        <source>Select Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <source>Input Plan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <source>About Subsurface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
+        <source>F1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="478"/>
+        <source>Ctrl+5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
+        <source>Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="448"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="450"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="455"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="456"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="695"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="696"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="144"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="250"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="286"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="197"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1031,215 +1255,235 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="218"/>
+        <location filename="../qt-ui/preferences.ui" line="199"/>
+        <source>Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="205"/>
+        <source>Use Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="225"/>
+        <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="235"/>
+        <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="245"/>
+        <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="269"/>
+        <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="276"/>
+        <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="286"/>
+        <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="303"/>
+        <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="313"/>
+        <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="330"/>
+        <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="340"/>
+        <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="350"/>
+        <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="357"/>
+        <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="377"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="464"/>
+        <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="472"/>
+        <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="495"/>
-        <location filename="../qt-ui/preferences.ui" line="536"/>
-        <location filename="../qt-ui/preferences.ui" line="577"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="513"/>
+        <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="554"/>
+        <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="595"/>
+        <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="618"/>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="634"/>
+        <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="643"/>
+        <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="666"/>
+        <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="677"/>
+        <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="700"/>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="710"/>
+        <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="721"/>
-        <source>Show time</source>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
+        <source>Calculate NDL/TTS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="733"/>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>Show SAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
+        <source>GFLow at max depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="739"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
-        <source>XML Files (*.xml)</source>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1377,51 +1621,86 @@ Please, remove them first.</source>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="257"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="259"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <source>Hide events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <source>Hide all %1 events?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <source>Remove the selected event?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <source>%1 @ %2:%3</source>
+        <translation type="unfinished"></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>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="337"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="383"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="384"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="582"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="850"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <source>Measure properties of dive segments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
+        <source>Scale your dive to screen size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="584"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="851"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="859"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="861"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="862"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished"></translation>
@@ -1430,62 +1709,62 @@ Please, remove them first.</source>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1497"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1502"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1505"/>
+        <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1512"/>
+        <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1517"/>
+        <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1519"/>
+        <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1547"/>
+        <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1549"/>
+        <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1551"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1564"/>
+        <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1570"/>
+        <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1494,30 +1773,22 @@ Please, remove them first.</source>
     <name>QObject</name>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="44"/>
         <source>AIR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="38"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="45"/>
-        <source>EAN32</source>
+        <location filename="../qt-ui/diveplanner.cpp" line="723"/>
+        <source>Remove this Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="46"/>
-        <source>EAN36</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="47"/>
-        <source>Choose Gas</source>
+        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <source>No location data - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="188"/>
-        <source>No location data - move the map and double-click to set the dive location</source>
+        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1526,17 +1797,17 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="26"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="29"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1555,92 +1826,95 @@ Please, remove them first.</source>
     </message>
 </context>
 <context>
-    <name>SubsurfaceAbout</name>
+    <name>ShiftTimesDialog</name>
     <message>
-        <location filename="../qt-ui/about.ui" line="23"/>
-        <source>About Subsurface</source>
+        <location filename="../qt-ui/shifttimes.ui" line="14"/>
+        <source>Shift selected times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
+        <location filename="../qt-ui/shifttimes.ui" line="35"/>
+        <source>Shift times of selected dives by</source>
         <translation type="unfinished"></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>
+        <location filename="../qt-ui/shifttimes.ui" line="80"/>
+        <source>h:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="22"/>
-        <source>&amp;License</source>
+        <location filename="../qt-ui/shifttimes.ui" line="90"/>
+        <source>earlier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
-        <source>&amp;Website</source>
+        <location filename="../qt-ui/shifttimes.ui" line="97"/>
+        <source>later</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SubsurfaceWebServices</name>
+    <name>SubsurfaceAbout</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="14"/>
-        <source>Download Location Data</source>
+        <location filename="../qt-ui/about.ui" line="23"/>
+        <source>About Subsurface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="37"/>
-        <source>Download</source>
+        <location filename="../qt-ui/about.ui" line="64"/>
+        <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="44"/>
-        <source>Enter your ID here</source>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="51"/>
-        <source>User ID</source>
+        <location filename="../qt-ui/about.cpp" line="22"/>
+        <source>&amp;License</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="58"/>
-        <source>Status:</source>
+        <location filename="../qt-ui/about.cpp" line="23"/>
+        <source>&amp;Website</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="49"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="90"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="106"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="130"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="133"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1661,17 +1935,17 @@ Please, remove them first.</source>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1679,7 +1953,7 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1393"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1687,96 +1961,139 @@ Please, remove them first.</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>WebServices</name>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="14"/>
+        <source>Download Location Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="20"/>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="27"/>
+        <source>Enter your ID here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="34"/>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="58"/>
+        <source>User ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="72"/>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="86"/>
+        <source>Upload</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="460"/>
+        <source>Clicking here will remove this weigthsystem.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
- &gt; Month</source>
+ &gt; Month / Trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1307"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1310"/>
+        <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1311"/>
+        <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1312"/>
-        <location filename="../qt-ui/models.cpp" line="1315"/>
-        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <location filename="../qt-ui/models.cpp" line="1418"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1313"/>
-        <location filename="../qt-ui/models.cpp" line="1316"/>
-        <location filename="../qt-ui/models.cpp" line="1319"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"></translation>
@@ -1785,91 +2102,70 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="44"/>
+        <location filename="../dive.c" line="57"/>
         <source>pascal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="48"/>
-        <location filename="../qt-gui.cpp" line="323"/>
+        <location filename="../dive.c" line="61"/>
+        <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="52"/>
-        <location filename="../qt-gui.cpp" line="326"/>
+        <location filename="../dive.c" line="65"/>
+        <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="88"/>
-        <location filename="../qt-gui.cpp" line="304"/>
+        <location filename="../dive.c" line="101"/>
+        <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="93"/>
-        <location filename="../qt-gui.cpp" line="307"/>
+        <location filename="../dive.c" line="106"/>
+        <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="121"/>
-        <location filename="../qt-gui.cpp" line="207"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="126"/>
-        <location filename="../qt-gui.cpp" line="210"/>
+        <location filename="../dive.c" line="139"/>
+        <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="170"/>
-        <location filename="../qt-gui.cpp" line="233"/>
+        <location filename="../dive.c" line="183"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
-        <location filename="../qt-gui.cpp" line="231"/>
+        <location filename="../dive.c" line="187"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="966"/>
+        <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="473"/>
-        <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="490"/>
-        <source>%1$s %2$d, %3$d
-%4$02d:%5$02d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="512"/>
-        <source>%1$s %2$d (%3$d dives)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="519"/>
-        <source>%1$s %2$d (1 dive)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="550"/>
-        <location filename="../planner.c" line="94"/>
-        <location filename="../planner.c" line="748"/>
-        <location filename="../planner.c" line="749"/>
-        <location filename="../statistics.c" line="360"/>
-        <location filename="../statistics.c" line="371"/>
+        <location filename="../divelist.c" line="488"/>
+        <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"/>
         <source>air</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1899,307 +2195,311 @@ Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../file.c" line="106"/>
-        <location filename="../file.c" line="108"/>
-        <location filename="../file.c" line="303"/>
-        <location filename="../file.c" line="305"/>
+        <location filename="../file.c" line="107"/>
+        <location filename="../file.c" line="109"/>
+        <location filename="../file.c" line="308"/>
+        <location filename="../file.c" line="310"/>
+        <location filename="../file.c" line="390"/>
+        <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <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>
+    </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>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
         <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="157"/>
+        <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="390"/>
+        <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="396"/>
+        <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="405"/>
+        <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="427"/>
+        <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="437"/>
+        <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="447"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="469"/>
+        <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="613"/>
+        <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="621"/>
+        <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="663"/>
+        <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="668"/>
+        <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="672"/>
+        <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="690"/>
+        <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="549"/>
+        <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1695"/>
+        <location filename="../parse-xml.c" line="1717"/>
         <source>Failed to parse &apos;%s&apos;.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1696"/>
+        <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1894"/>
+        <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1929"/>
+        <location filename="../parse-xml.c" line="1951"/>
         <source>Database connection failed &apos;%s&apos;.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1936"/>
+        <location filename="../parse-xml.c" line="1958"/>
         <source>Database query failed &apos;%s&apos;.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2048"/>
+        <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="96"/>
-        <location filename="../statistics.c" line="363"/>
+        <location filename="../planner.c" line="98"/>
+        <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="131"/>
+        <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="192"/>
-        <source>Cylinder for planning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../planner.c" line="217"/>
-        <source>Simulated Dive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../planner.c" line="294"/>
+        <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="472"/>
+        <location filename="../planner.c" line="493"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -2208,457 +2508,481 @@ based on GFlow = %.0f and GFhigh = %.0f
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="513"/>
+        <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="522"/>
+        <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="552"/>
+        <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="776"/>
         <source>ean</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1154"/>
-        <source>D:%.1f %s</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1158"/>
-        <source>%s
-T:%d:%02d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1177"/>
+        <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1189"/>
+        <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1199"/>
+        <source>@:%d:%02d
+D:%.1f %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1219"/>
+        <source>%s
+SAC:%2.1fl/min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1211"/>
+        <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1217"/>
+        <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
+        <location filename="../profile.c" line="1275"/>
         <source>%s
-NDL:-</source>
+NDL:%umin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../profile.c" line="1223"/>
         <source>%s
-NDL:%umin</source>
+CNS:%u%%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../profile.c" line="1227"/>
         <source>%s
-TTS:%umin</source>
+pO%s:%.2fbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../profile.c" line="1231"/>
         <source>%s
-CNS:%u%%</source>
+pN%s:%.2fbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../profile.c" line="1235"/>
         <source>%s
-pO%s:%.2fbar</source>
+pHe:%.2fbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1240"/>
         <source>%s
-pN%s:%.2fbar</source>
+MOD:%d%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1243"/>
+        <location filename="../profile.c" line="1247"/>
         <source>%s
-pHe:%.2fbar</source>
+EAD:%d%s
+END:%d%s
+EADD:%d%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1280"/>
         <source>%s
-MOD:%d%s</source>
+Deco:%umin @ %.0f %s (calc)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1289"/>
         <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
+In deco (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>%s
+NDL:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1296"/>
+        <source>%s
+TTS:%umin (calc)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1349"/>
+        <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
-        <location filename="../profile.c" line="1357"/>
+        <location filename="../profile.c" line="1409"/>
+        <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1361"/>
+        <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1365"/>
+        <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1369"/>
-        <source>%s%sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1425"/>
+        <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1373"/>
-        <location filename="../profile.c" line="1377"/>
-        <source>%s %sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1429"/>
+        <location filename="../profile.c" line="1433"/>
+        <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1384"/>
+        <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="284"/>
+        <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="288"/>
+        <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
-        <source>invalid</source>
+        <location filename="../qt-gui.cpp" line="460"/>
+        <source>%1, %2 %3, %4 %5:%6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../qt-gui.cpp" line="473"/>
+        <source>%1 %2, %3
+%4:%5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="486"/>
+        <source>%1 %2 (%3 dives)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="491"/>
+        <source>%1 %2 (1 dive)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="13"/>
         <source>boat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>shore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>drift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>deep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>cavern</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="14"/>
         <source>ice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>wreck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>cave</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>altitude</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>pool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>lake</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="16"/>
         <source>river</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="17"/>
         <source>night</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
-        <source>freshwater</source>
+        <location filename="../dive.c" line="17"/>
+        <source>fresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
-        <source>training</source>
+        <location filename="../dive.c" line="17"/>
+        <source>student</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
-        <source>teaching</source>
+        <location filename="../dive.c" line="18"/>
+        <source>photo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
-        <source>photo</source>
+        <location filename="../dive.c" line="18"/>
+        <source>video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
-        <source>video</source>
+        <location filename="../dive.c" line="18"/>
+        <source>instructor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="19"/>
         <source>deco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="199"/>
+        <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="205"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="207"/>
+        <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="218"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="225"/>
+        <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="260"/>
+        <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="262"/>
+        <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="264"/>
+        <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="266"/>
+        <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="363"/>
-        <source>, EAN%d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/translations/subsurface_da_DK.ts b/translations/subsurface_da_DK.ts
index c97253fdd..b772c4ead 100644
--- a/translations/subsurface_da_DK.ts
+++ b/translations/subsurface_da_DK.ts
@@ -1684,42 +1684,135 @@ double click i dykke listen</translation>
     </message>
 </context>
 <context>
+    <name>CSVImportDialog</name>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <source>Import File (CSV)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <source>Field Separator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <source>Field Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <source>Time</source>
+        <translation type="unfinished">Tid</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <source>Depth</source>
+        <translation type="unfinished">Dybde</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <source>Temp</source>
+        <translation type="unfinished">Temp</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
+        <source>Po2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <source>Cns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <source>Stopdepth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <source>Pre-configured imports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>Open CSV Log File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>CSV Files (*.csv)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
         <translation type="unfinished">Størrelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="65"/>
+        <source>Switch at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="163"/>
+        <source>Clicking here will remove this cylinder.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="385"/>
+        <source>Cylinder cannot be removed</source>
+        <translation type="unfinished"></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>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
@@ -1743,30 +1836,35 @@ double click i dykke listen</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Device ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Model</source>
         <translation type="unfinished">Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
         <translation type="unfinished">Kaldenavn</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <source>Clicking here will remove this divecomputer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1009"/>
+        <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1011"/>
+        <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1774,186 +1872,206 @@ double click i dykke listen</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="39"/>
+        <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="398"/>
+        <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="399"/>
+        <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="400"/>
-        <source>collapse</source>
+        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <source>collapse others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="402"/>
-        <source>remove dive from trip</source>
+        <location filename="../qt-ui/divelistview.cpp" line="638"/>
+        <source>remove dive(s) from trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="405"/>
-        <source>Merge trip with trip above</source>
-        <translation type="unfinished">Flet tur med turen over</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="639"/>
+        <source>create new trip above</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="406"/>
-        <source>Merge trip with trip below</source>
-        <translation type="unfinished">Flet tur med turen under</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="640"/>
+        <source>add dive(s) to trip immideately above</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="410"/>
-        <source>delete dive</source>
+        <location filename="../qt-ui/divelistview.cpp" line="643"/>
+        <source>merge trip with trip above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="412"/>
-        <source>merge selected dives</source>
+        <location filename="../qt-ui/divelistview.cpp" line="644"/>
+        <source>merge trip with trip below</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../qt-ui/divelistview.cpp" line="648"/>
+        <source>delete dive(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
-        <source>Bottom SAC</source>
+        <location filename="../qt-ui/divelistview.cpp" line="652"/>
+        <source>save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
-        <source>High GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="653"/>
+        <source>export As UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
-        <source>SAC on DECO Stop</source>
+        <location filename="../qt-ui/divelistview.cpp" line="654"/>
+        <source>shift times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
-        <source>Low GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
+        <source>Save Dives As...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="114"/>
-        <source>Last Stop at 6m</source>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
+        <source>Save File as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="141"/>
-        <source>Start Time</source>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="148"/>
-        <source>ATM Pressure</source>
+        <source>Merge trip with trip above</source>
+        <translation type="obsolete">Flet tur med turen over</translation>
+    </message>
+    <message>
+        <source>Merge trip with trip below</source>
+        <translation type="obsolete">Flet tur med turen under</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <source>merge selected dives</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DivePlannerGraphics</name>
+    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="143"/>
-        <source>10m</source>
+        <location filename="../qt-ui/diveplanner.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="145"/>
-        <source>30ft</source>
+        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <source>Bottom SAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <source>SAC on DECO Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="146"/>
-        <source>Increase maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="147"/>
-        <source>Decreases maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="108"/>
+        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <source>Increase minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <source>Last Stop at 6m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>10min</source>
+        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>Decreases minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <source>ATM Pressure</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DivePlannerGraphics</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
-        <source>Handler Position Error</source>
+        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <source>10m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="386"/>
-        <source>One or more of your stops will be lost with this operations, 
-Please, remove them first.</source>
+        <location filename="../qt-ui/diveplanner.cpp" line="136"/>
+        <source>30ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="415"/>
-        <source>Air</source>
+        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <source>Handler Position Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="420"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="421"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="424"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="425"/>
-        <source>Air</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <source>AIR</source>
+        <translation type="unfinished">LUFT</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="986"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="987"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
         <translation type="unfinished">Varighed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="988"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="989"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1141"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1142"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1961,75 +2079,85 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="851"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="937"/>
+        <source>Available Gases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <source>add dive data point</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1051"/>
+        <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
         <translation type="unfinished">#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1052"/>
+        <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
         <translation type="unfinished">Dato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
         <translation type="unfinished">m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
         <translation type="unfinished">fod</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1055"/>
+        <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
         <translation type="unfinished">min.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
         <translation type="unfinished">pund (lbs)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1058"/>
+        <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
         <translation type="unfinished">Dragt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1059"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
         <translation type="unfinished">Cyl</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1061"/>
+        <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
         <translation type="unfinished">SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1062"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1063"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1064"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
         <translation type="unfinished">Sted</translation>
     </message>
@@ -2037,13 +2165,19 @@ Please, remove them first.</source>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="138"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
         <translation type="unfinished">Fejl</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="142"/>
-        <source>retry</source>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
+        <source>Retry</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2104,6 +2238,7 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
         <translation type="unfinished">Dyk notater</translation>
     </message>
@@ -2118,225 +2253,238 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <source>M/d/yy h:mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="108"/>
-        <location filename="../qt-ui/maintab.cpp" line="307"/>
+        <location filename="../qt-ui/maintab.ui" line="112"/>
+        <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
         <translation type="unfinished">Sted</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="122"/>
+        <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="136"/>
+        <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
         <translation type="unfinished">Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="143"/>
+        <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
         <translation type="unfinished">Makker</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="166"/>
+        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="173"/>
+        <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
         <translation type="unfinished">Sigtbarhed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="182"/>
+        <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
         <translation type="unfinished">Dragt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="206"/>
-        <location filename="../qt-ui/maintab.cpp" line="308"/>
+        <location filename="../qt-ui/maintab.ui" line="217"/>
+        <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
         <translation type="unfinished">Noter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="232"/>
+        <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
         <translation type="unfinished">Udstyr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="319"/>
+        <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
         <translation type="unfinished">Dyk info</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="361"/>
+        <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
         <translation type="unfinished">Dato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="380"/>
+        <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="399"/>
+        <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="418"/>
+        <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="437"/>
-        <location filename="../qt-ui/maintab.ui" line="692"/>
+        <location filename="../qt-ui/maintab.ui" line="466"/>
+        <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
         <translation type="unfinished">SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="456"/>
+        <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="475"/>
+        <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="494"/>
+        <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="513"/>
+        <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="532"/>
+        <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="551"/>
+        <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="570"/>
+        <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
         <translation type="unfinished">Dykker Tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="589"/>
+        <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
         <translation type="unfinished">Statistik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="668"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation type="unfinished">Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="680"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation type="unfinished">Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="704"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation type="unfinished">Varighed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="716"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation type="unfinished">Total tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="735"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation type="unfinished">Dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="68"/>
+        <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
         <translation type="unfinished">Flasker </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="129"/>
-        <location filename="../qt-ui/maintab.cpp" line="131"/>
-        <source>This trip is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <source>Trip Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="137"/>
-        <location filename="../qt-ui/maintab.cpp" line="139"/>
-        <source>This dive is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="296"/>
+        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <source>Trip Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="286"/>
-        <source>Trip Location</source>
+        <location filename="../qt-ui/maintab.cpp" line="134"/>
+        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="288"/>
-        <source>Trip Notes</source>
+        <location filename="../qt-ui/maintab.cpp" line="143"/>
+        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
-        <location filename="../qt-ui/maintab.cpp" line="337"/>
-        <location filename="../qt-ui/maintab.cpp" line="338"/>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="146"/>
+        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <source>This dive is being edited. Select Save or Cancel when done.</source>
+        <translation type="unfinished"></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"/>
         <source>/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <source>unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
         <translation type="unfinished">N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
         <translation type="unfinished">S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
         <translation type="unfinished">Ø</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
         <translation type="unfinished">V</translation>
     </message>
@@ -2349,308 +2497,416 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="177"/>
         <source>File</source>
-        <translation type="unfinished">Fil</translation>
+        <translation type="obsolete">Fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="196"/>
         <source>Log</source>
-        <translation type="unfinished">Log</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="211"/>
-        <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="226"/>
+        <location filename="../qt-ui/mainwindow.ui" line="218"/>
         <source>Filter</source>
         <translation type="unfinished">Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="232"/>
         <source>Help</source>
-        <translation type="unfinished">Hjælp</translation>
+        <translation type="obsolete">Hjælp</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="177"/>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <source>&amp;Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <source>&amp;View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <source>&amp;Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>&amp;New logbook</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="245"/>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
         <translation type="unfinished">Ny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <source>&amp;Open logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="256"/>
+        <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
+        <location filename="../qt-ui/mainwindow.ui" line="281"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation type="unfinished">Gem som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
+        <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="277"/>
+        <location filename="../qt-ui/mainwindow.ui" line="292"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation type="unfinished">Luk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="285"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="176"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <source>Export UDDF</source>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <source>Export &amp;UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
-        <source>Print</source>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <source>Ctrl+U</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="301"/>
-        <source>Ctrl+P</source>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <source>&amp;Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
-        <source>Preferences</source>
-        <translation type="unfinished">Indstillinger</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <source>Ctrl+,</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="311"/>
-        <source>Quit</source>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
-        <source>Ctrl+Q</source>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <source>Import from &amp;dive computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <source>Download from Dive computer</source>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
-        <source>Ctrl+D</source>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <source>Ctrl+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="327"/>
-        <source>Download from Web Service</source>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <source>&amp;Edit Device Names</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="332"/>
-        <source>Edit Device Names</source>
-        <translation type="unfinished">Rediger enheds navne</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <source>Ctrl++</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="337"/>
-        <source>Add Dive</source>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <source>&amp;Renumber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
-        <source>Renumber</source>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Ctrl+R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
-        <source>Auto Group</source>
+        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <source>Toggle &amp;Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
-        <source>Toggle Zoom</source>
-        <translation type="unfinished">Skift Zoom</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <source>&amp;Yearly Statistics</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
-        <source>Yearly Statistics</source>
+        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <source>Ctrl+Y</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
-        <source>View List</source>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Dive List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="365"/>
-        <source>Ctrl+2</source>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <source>Profile</source>
+        <translation type="unfinished">Profil</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <source>Info</source>
+        <translation type="unfinished">Info</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
-        <source>View Profile</source>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <source>User &amp;Manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="373"/>
-        <source>Ctrl+3</source>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <source>Globe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
-        <source>View Info</source>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <source>P&amp;lan Dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="381"/>
-        <source>Ctrl+4</source>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <source>Ctrl+L</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <source>Import CSV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <source>Import CS&amp;V</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <source>Import from Divelogs.de</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <source>Preferences</source>
+        <translation type="unfinished">Indstillinger</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <source>Ctrl+D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Device Names</source>
+        <translation type="obsolete">Rediger enheds navne</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <source>Add Dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="386"/>
-        <source>View All</source>
+        <source>Auto Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="389"/>
+        <source>Toggle Zoom</source>
+        <translation type="obsolete">Skift Zoom</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <source>Ctrl+2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <source>Ctrl+3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <source>Ctrl+4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>Ctrl+1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Prev DC</source>
         <translation type="unfinished">Forrige DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
+        <location filename="../qt-ui/mainwindow.ui" line="439"/>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="402"/>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Next DC</source>
         <translation type="unfinished">Næste DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="405"/>
+        <location filename="../qt-ui/mainwindow.ui" line="447"/>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="410"/>
+        <location filename="../qt-ui/mainwindow.ui" line="452"/>
         <source>Select Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
         <source>Input Plan</source>
         <translation type="unfinished">Input Plan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
         <source>About Subsurface</source>
         <translation type="unfinished">Om Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>User Manual</source>
-        <translation type="unfinished">Brugermanual</translation>
+        <translation type="obsolete">Brugermanual</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>F1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="433"/>
-        <source>View Globe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="478"/>
         <source>Ctrl+5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="441"/>
-        <source>Dive Planner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="108"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Open File</source>
         <translation type="unfinished">Åben fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="271"/>
-        <source>manually added dive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="448"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="450"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="455"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
         <translation type="unfinished">Gem ændringer?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="456"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="695"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="696"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="144"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="250"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="286"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="197"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2713,215 +2969,235 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="218"/>
+        <location filename="../qt-ui/preferences.ui" line="199"/>
+        <source>Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="205"/>
+        <source>Use Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="225"/>
+        <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="235"/>
+        <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="245"/>
+        <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="269"/>
+        <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
         <translation type="unfinished">Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="276"/>
+        <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
         <translation type="unfinished">Meter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="286"/>
+        <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
         <translation type="unfinished">Fod</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
         <translation type="unfinished">Tryk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="303"/>
+        <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
         <translation type="unfinished">Bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="313"/>
+        <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="330"/>
+        <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
         <translation type="unfinished">Liter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="340"/>
+        <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
         <translation type="unfinished">CuFt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="350"/>
+        <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
         <translation type="unfinished">Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="357"/>
+        <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
         <translation type="unfinished">Celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
         <translation type="unfinished">Fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="377"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
         <translation type="unfinished">Vægt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
         <translation type="unfinished">pund (lbs)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="464"/>
+        <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="472"/>
+        <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="495"/>
-        <location filename="../qt-ui/preferences.ui" line="536"/>
-        <location filename="../qt-ui/preferences.ui" line="577"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="513"/>
+        <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="554"/>
+        <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="595"/>
+        <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="618"/>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="634"/>
+        <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="643"/>
+        <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="666"/>
+        <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="677"/>
+        <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="700"/>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="710"/>
+        <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="721"/>
-        <source>Show time</source>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
+        <source>Calculate NDL/TTS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="733"/>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>Show SAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
+        <source>GFLow at max depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="739"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
-        <source>XML Files (*.xml)</source>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3059,51 +3335,86 @@ Please, remove them first.</source>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="257"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="259"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <source>Hide events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <source>Hide all %1 events?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <source>Remove the selected event?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <source>%1 @ %2:%3</source>
+        <translation type="unfinished"></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>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="337"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="383"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="384"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="582"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="850"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <source>Measure properties of dive segments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
+        <source>Scale your dive to screen size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
+        <source>Edit</source>
+        <translation type="unfinished">Rediger</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
         <translation type="unfinished">luft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="584"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="851"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="859"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
         <translation type="unfinished">Bailing out to OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="861"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished">start</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="862"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished">slut</translation>
@@ -3112,62 +3423,62 @@ Please, remove them first.</source>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1497"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1502"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1505"/>
+        <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1512"/>
+        <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1517"/>
+        <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
         <translation type="unfinished">Flaske</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1519"/>
+        <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
         <translation type="unfinished">Gasblanding</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1547"/>
+        <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
         <translation type="unfinished">SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1549"/>
+        <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
         <translation type="unfinished">Max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1551"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1564"/>
+        <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1570"/>
+        <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3176,30 +3487,30 @@ Please, remove them first.</source>
     <name>QObject</name>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="44"/>
         <source>AIR</source>
         <translation type="unfinished">LUFT</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="38"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="45"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="723"/>
+        <source>Remove this Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>EAN32</source>
-        <translation type="unfinished">EAN32</translation>
+        <translation type="obsolete">EAN32</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="46"/>
         <source>EAN36</source>
-        <translation type="unfinished">EAN36</translation>
+        <translation type="obsolete">EAN36</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="47"/>
-        <source>Choose Gas</source>
+        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <source>No location data - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="188"/>
-        <source>No location data - move the map and double-click to set the dive location</source>
+        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3208,17 +3519,17 @@ Please, remove them first.</source>
         <translation type="unfinished">Luk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="26"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation type="unfinished">Gennemsnit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="29"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation type="unfinished">Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3237,92 +3548,95 @@ Please, remove them first.</source>
     </message>
 </context>
 <context>
-    <name>SubsurfaceAbout</name>
+    <name>ShiftTimesDialog</name>
     <message>
-        <location filename="../qt-ui/about.ui" line="23"/>
-        <source>About Subsurface</source>
-        <translation type="unfinished">Om Subsurface</translation>
+        <location filename="../qt-ui/shifttimes.ui" line="14"/>
+        <source>Shift selected times</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
+        <location filename="../qt-ui/shifttimes.ui" line="35"/>
+        <source>Shift times of selected dives by</source>
         <translation type="unfinished"></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>
+        <location filename="../qt-ui/shifttimes.ui" line="80"/>
+        <source>h:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="22"/>
-        <source>&amp;License</source>
+        <location filename="../qt-ui/shifttimes.ui" line="90"/>
+        <source>earlier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
-        <source>&amp;Website</source>
+        <location filename="../qt-ui/shifttimes.ui" line="97"/>
+        <source>later</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SubsurfaceWebServices</name>
+    <name>SubsurfaceAbout</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="14"/>
-        <source>Download Location Data</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/about.ui" line="23"/>
+        <source>About Subsurface</source>
+        <translation type="unfinished">Om Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="37"/>
-        <source>Download</source>
+        <location filename="../qt-ui/about.ui" line="64"/>
+        <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="44"/>
-        <source>Enter your ID here</source>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="51"/>
-        <source>User ID</source>
+        <location filename="../qt-ui/about.cpp" line="22"/>
+        <source>&amp;License</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="58"/>
-        <source>Status:</source>
+        <location filename="../qt-ui/about.cpp" line="23"/>
+        <source>&amp;Website</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="49"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="90"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="106"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="130"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
         <translation type="unfinished">Forbindelses fejl:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
         <translation type="unfinished">Ugyldig bruger navn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
         <translation type="unfinished">Kan ikke fortolke svar!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="133"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
         <translation type="unfinished">Download succes!</translation>
     </message>
@@ -3343,17 +3657,17 @@ Please, remove them first.</source>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Bar</source>
         <translation type="unfinished">Bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3361,7 +3675,7 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1393"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3369,96 +3683,139 @@ Please, remove them first.</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>WebServices</name>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="14"/>
+        <source>Download Location Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="20"/>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="27"/>
+        <source>Enter your ID here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="34"/>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="58"/>
+        <source>User ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="72"/>
+        <source>Password</source>
+        <translation type="unfinished">Password</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="86"/>
+        <source>Upload</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
         <translation type="unfinished">Vægt</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="460"/>
+        <source>Clicking here will remove this weigthsystem.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
- &gt; Month</source>
+ &gt; Month / Trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
         <translation type="unfinished">#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1307"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1310"/>
+        <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1311"/>
+        <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1312"/>
-        <location filename="../qt-ui/models.cpp" line="1315"/>
-        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <location filename="../qt-ui/models.cpp" line="1418"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1313"/>
-        <location filename="../qt-ui/models.cpp" line="1316"/>
-        <location filename="../qt-ui/models.cpp" line="1319"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"></translation>
@@ -3467,91 +3824,74 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="44"/>
+        <location filename="../dive.c" line="57"/>
         <source>pascal</source>
         <translation type="unfinished">pascal</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="48"/>
-        <location filename="../qt-gui.cpp" line="323"/>
+        <location filename="../dive.c" line="61"/>
+        <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
         <translation type="unfinished">bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="52"/>
-        <location filename="../qt-gui.cpp" line="326"/>
+        <location filename="../dive.c" line="65"/>
+        <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
         <translation type="unfinished">psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="88"/>
-        <location filename="../qt-gui.cpp" line="304"/>
+        <location filename="../dive.c" line="101"/>
+        <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
         <translation type="unfinished">l</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="93"/>
-        <location filename="../qt-gui.cpp" line="307"/>
+        <location filename="../dive.c" line="106"/>
+        <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="121"/>
-        <location filename="../qt-gui.cpp" line="207"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
         <translation type="unfinished">m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="126"/>
-        <location filename="../qt-gui.cpp" line="210"/>
+        <location filename="../dive.c" line="139"/>
+        <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
         <translation type="unfinished">fod</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="170"/>
-        <location filename="../qt-gui.cpp" line="233"/>
+        <location filename="../dive.c" line="183"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
         <translation type="unfinished">pund (lbs)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
-        <location filename="../qt-gui.cpp" line="231"/>
+        <location filename="../dive.c" line="187"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="966"/>
+        <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
         <translation type="unfinished">(%s) eller (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="473"/>
         <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <translation type="unfinished">%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="490"/>
-        <source>%1$s %2$d, %3$d
-%4$02d:%5$02d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="512"/>
-        <source>%1$s %2$d (%3$d dives)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="519"/>
-        <source>%1$s %2$d (1 dive)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="550"/>
-        <location filename="../planner.c" line="94"/>
-        <location filename="../planner.c" line="748"/>
-        <location filename="../planner.c" line="749"/>
-        <location filename="../statistics.c" line="360"/>
-        <location filename="../statistics.c" line="371"/>
+        <location filename="../divelist.c" line="488"/>
+        <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"/>
         <source>air</source>
         <translation type="unfinished">luft</translation>
     </message>
@@ -3581,307 +3921,319 @@ Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../file.c" line="106"/>
-        <location filename="../file.c" line="108"/>
-        <location filename="../file.c" line="303"/>
-        <location filename="../file.c" line="305"/>
+        <location filename="../file.c" line="107"/>
+        <location filename="../file.c" line="109"/>
+        <location filename="../file.c" line="308"/>
+        <location filename="../file.c" line="310"/>
+        <location filename="../file.c" line="390"/>
+        <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation type="unfinished">Fejl i læsning af &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <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>
+    </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>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
         <translation type="unfinished">deco stop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
         <translation type="unfinished">opstigning</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
         <translation type="unfinished">bogmærke</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
         <translation type="unfinished">overflade</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
         <translation type="unfinished">sikkerhedsstop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
         <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
         <translation type="unfinished">gasskifte</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
         <translation type="unfinished">dybe stop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
         <translation type="unfinished">dykketid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
         <translation type="unfinished">Maks. dybde</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
         <translation type="unfinished">OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
         <translation type="unfinished">PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="157"/>
+        <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="390"/>
+        <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="396"/>
+        <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
         <translation type="unfinished">Fejl i registrering af data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="405"/>
+        <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
         <translation type="unfinished">Fejl ved fortolkning af dato/tid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
         <translation type="unfinished">Dyk %d: %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="427"/>
+        <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
         <translation type="unfinished">Fejl i fortolkning af dykkertid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="437"/>
+        <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
         <translation type="unfinished">Fejl i fortolkning af max dybde</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="447"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
         <translation type="unfinished">Fejl i fortolkning af antallet af gasser</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
         <translation type="unfinished">Fejl i læsning af saltindhold i vandet</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="469"/>
+        <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
         <translation type="unfinished">Fejl i fortolkning af gas blanding</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
         <translation type="unfinished">Fejl i fortolkning af prøver</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="613"/>
+        <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
         <translation type="unfinished">Event: waiting for user action</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="621"/>
+        <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="663"/>
+        <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
         <translation type="unfinished">Error registering the event handler.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="668"/>
+        <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished">Error registering the cancellation handler.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="672"/>
+        <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
         <translation type="unfinished">Import fejl i dykker data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="690"/>
+        <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="549"/>
+        <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1695"/>
+        <location filename="../parse-xml.c" line="1717"/>
         <source>Failed to parse &apos;%s&apos;.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1696"/>
+        <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation type="unfinished">Fejl i fortolkning af &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1894"/>
+        <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1929"/>
+        <location filename="../parse-xml.c" line="1951"/>
         <source>Database connection failed &apos;%s&apos;.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1936"/>
+        <location filename="../parse-xml.c" line="1958"/>
         <source>Database query failed &apos;%s&apos;.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2048"/>
+        <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="96"/>
-        <location filename="../statistics.c" line="363"/>
+        <location filename="../planner.c" line="98"/>
+        <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
         <translation type="unfinished">EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="131"/>
+        <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation type="unfinished">Kan ikke finde gas %d/%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="192"/>
         <source>Cylinder for planning</source>
-        <translation type="unfinished">Flaske for planlægning</translation>
+        <translation type="obsolete">Flaske for planlægning</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="217"/>
         <source>Simulated Dive</source>
-        <translation type="unfinished">Simuleret Dyk</translation>
+        <translation type="obsolete">Simuleret Dyk</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="294"/>
+        <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
         <translation type="unfinished">For mange gas blandinger</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="472"/>
+        <location filename="../planner.c" line="493"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -3894,33 +4246,33 @@ baseret på GFlow = %.0f og GFhigh = %.0f⏎
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="513"/>
+        <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="522"/>
+        <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
         <translation type="unfinished">Skift gas til %s⏎
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
         <translation type="unfinished">Gasforbrug:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="552"/>
+        <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
         <translation type="unfinished">%.0f%s of %s⏎
@@ -3928,145 +4280,138 @@ baseret på GFlow = %.0f og GFhigh = %.0f⏎
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="776"/>
         <source>ean</source>
         <translation type="unfinished">ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1154"/>
         <source>D:%.1f %s</source>
-        <translation type="unfinished">D:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1158"/>
-        <source>%s
-T:%d:%02d</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">D:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
         <translation type="unfinished">%s⏎
 P:%d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
         <translation type="unfinished">%s⏎
 T:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1177"/>
+        <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation type="unfinished">%s⏎
 Beregnet loft %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1189"/>
+        <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation type="unfinished">%s⏎
 Sikkerhedsstop:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1199"/>
+        <source>@:%d:%02d
+D:%.1f %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1219"/>
+        <source>%s
+SAC:%2.1fl/min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation type="unfinished">%s⏎
 Sikkerhedsstop:Ukendt tid @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation type="unfinished">%s⏎
 Deko:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1211"/>
+        <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation type="unfinished">%s⏎
 Deko:unkn time @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1217"/>
+        <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
         <translation type="unfinished">%s⏎
 In deko</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
-        <source>%s
-NDL:-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1275"/>
         <source>%s
 NDL:%umin</source>
         <translation type="unfinished">%s⏎
 NDL:%umin</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
-        <source>%s
-TTS:%umin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1223"/>
         <source>%s
 CNS:%u%%</source>
         <translation type="unfinished">%s⏎
 CNS:%u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1227"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation type="unfinished">%s⏎
 pO%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1231"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation type="unfinished">%s⏎
 pN%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1243"/>
+        <location filename="../profile.c" line="1235"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation type="unfinished">%s⏎
 pHe:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1240"/>
         <source>%s
 MOD:%d%s</source>
         <translation type="unfinished">%s⏎
 MOD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1247"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -4077,295 +4422,342 @@ END:%d%s⏎
 EADD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1349"/>
+        <location filename="../profile.c" line="1280"/>
+        <source>%s
+Deco:%umin @ %.0f %s (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1289"/>
+        <source>%s
+In deco (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>%s
+NDL:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1296"/>
+        <source>%s
+TTS:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
-        <location filename="../profile.c" line="1357"/>
+        <location filename="../profile.c" line="1409"/>
+        <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1361"/>
+        <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1365"/>
+        <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1369"/>
-        <source>%s%sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1425"/>
+        <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1373"/>
-        <location filename="../profile.c" line="1377"/>
-        <source>%s %sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1429"/>
+        <location filename="../profile.c" line="1433"/>
+        <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1384"/>
+        <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="284"/>
+        <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="288"/>
+        <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
-        <source>invalid</source>
+        <location filename="../qt-gui.cpp" line="460"/>
+        <source>%1, %2 %3, %4 %5:%6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="473"/>
+        <source>%1 %2, %3
+%4:%5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="486"/>
+        <source>%1 %2 (%3 dives)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="491"/>
+        <source>%1 %2 (1 dive)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>boat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>shore</source>
         <translation type="unfinished">strand</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>drift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>deep</source>
         <translation type="unfinished">dybde</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>cavern</source>
         <translation type="unfinished">hule</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="14"/>
         <source>ice</source>
         <translation type="unfinished">is</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>wreck</source>
         <translation type="unfinished">vrag</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>cave</source>
         <translation type="unfinished">grotte</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>altitude</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>pool</source>
         <translation type="unfinished">swimming pool</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>lake</source>
         <translation type="unfinished">sø</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="16"/>
         <source>river</source>
         <translation type="unfinished">flod</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="17"/>
         <source>night</source>
         <translation type="unfinished">nat</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="17"/>
+        <source>fresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="17"/>
+        <source>student</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>freshwater</source>
-        <translation type="unfinished">ferskvand</translation>
+        <translation type="obsolete">ferskvand</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
         <source>training</source>
-        <translation type="unfinished">kursus</translation>
+        <translation type="obsolete">kursus</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
         <source>teaching</source>
-        <translation type="unfinished">undervisning</translation>
+        <translation type="obsolete">undervisning</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
         <source>photo</source>
         <translation type="unfinished">fotografering</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
         <source>video</source>
         <translation type="unfinished">video</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
+        <source>instructor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="19"/>
         <source>deco</source>
         <translation type="unfinished">deco</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="199"/>
+        <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
         <translation type="unfinished">mere end %d dage</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="205"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation type="unfinished">%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="207"/>
+        <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
         <translation type="unfinished">%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="218"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation type="unfinished">for dyk #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="225"/>
+        <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
         <translation type="unfinished">for de valgte dyk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="260"/>
+        <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
         <translation type="unfinished">for dyk #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="262"/>
+        <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
         <translation type="unfinished">for det valgte dyk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="264"/>
+        <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
         <translation type="unfinished">for alle dyk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="266"/>
+        <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
         <translation type="unfinished">(ingen dyk)</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="363"/>
-        <source>, EAN%d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
         <translation type="unfinished">Søn</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
         <translation type="unfinished">Man</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
         <translation type="unfinished">Tir</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
         <translation type="unfinished">Ons</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
         <translation type="unfinished">Tor</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
         <translation type="unfinished">Fre</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
         <translation type="unfinished">Lør</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
         <translation type="unfinished">Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
         <translation type="unfinished">Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
         <translation type="unfinished">Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
         <translation type="unfinished">Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
         <translation type="unfinished">Maj</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
         <translation type="unfinished">Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
         <translation type="unfinished">Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
         <translation type="unfinished">Aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
         <translation type="unfinished">Sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
         <translation type="unfinished">Okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
         <translation type="unfinished">Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
         <translation type="unfinished">Dec</translation>
     </message>
diff --git a/translations/subsurface_de_CH.ts b/translations/subsurface_de_CH.ts
index 3dcc9df47..f38f7bf4c 100644
--- a/translations/subsurface_de_CH.ts
+++ b/translations/subsurface_de_CH.ts
@@ -2314,42 +2314,135 @@ Martin Gysel</translation>
     </message>
 </context>
 <context>
+    <name>CSVImportDialog</name>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <source>Import File (CSV)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <source>Field Separator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <source>Field Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <source>Time</source>
+        <translation type="unfinished">Zeit</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <source>Depth</source>
+        <translation type="unfinished">Tiefe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <source>Temp</source>
+        <translation type="unfinished">Temperatur</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
+        <source>Po2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <source>Cns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <source>Stopdepth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <source>Pre-configured imports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>Open CSV Log File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>CSV Files (*.csv)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
         <translation type="unfinished">Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
         <translation type="unfinished">Grösse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="65"/>
+        <source>Switch at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="163"/>
+        <source>Clicking here will remove this cylinder.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="385"/>
+        <source>Cylinder cannot be removed</source>
+        <translation type="unfinished"></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>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
@@ -2373,30 +2466,35 @@ Martin Gysel</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Device ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Model</source>
         <translation type="unfinished">Modell</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
         <translation type="unfinished">Gerätename</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <source>Clicking here will remove this divecomputer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1009"/>
+        <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1011"/>
+        <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2404,186 +2502,206 @@ Martin Gysel</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="39"/>
+        <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="398"/>
+        <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="399"/>
+        <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="400"/>
-        <source>collapse</source>
+        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <source>collapse others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="402"/>
-        <source>remove dive from trip</source>
+        <location filename="../qt-ui/divelistview.cpp" line="638"/>
+        <source>remove dive(s) from trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="405"/>
-        <source>Merge trip with trip above</source>
-        <translation type="unfinished">Reise mit der darüber verbinden</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="639"/>
+        <source>create new trip above</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="406"/>
-        <source>Merge trip with trip below</source>
-        <translation type="unfinished">Reise mit der darunter verbinden</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="640"/>
+        <source>add dive(s) to trip immideately above</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="410"/>
-        <source>delete dive</source>
+        <location filename="../qt-ui/divelistview.cpp" line="643"/>
+        <source>merge trip with trip above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="412"/>
-        <source>merge selected dives</source>
+        <location filename="../qt-ui/divelistview.cpp" line="644"/>
+        <source>merge trip with trip below</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../qt-ui/divelistview.cpp" line="648"/>
+        <source>delete dive(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
-        <source>Bottom SAC</source>
+        <location filename="../qt-ui/divelistview.cpp" line="652"/>
+        <source>save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
-        <source>High GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="653"/>
+        <source>export As UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
-        <source>SAC on DECO Stop</source>
+        <location filename="../qt-ui/divelistview.cpp" line="654"/>
+        <source>shift times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
-        <source>Low GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
+        <source>Save Dives As...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="114"/>
-        <source>Last Stop at 6m</source>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
+        <source>Save File as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="141"/>
-        <source>Start Time</source>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="148"/>
-        <source>ATM Pressure</source>
+        <source>Merge trip with trip above</source>
+        <translation type="obsolete">Reise mit der darüber verbinden</translation>
+    </message>
+    <message>
+        <source>Merge trip with trip below</source>
+        <translation type="obsolete">Reise mit der darunter verbinden</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <source>merge selected dives</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DivePlannerGraphics</name>
+    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="143"/>
-        <source>10m</source>
+        <location filename="../qt-ui/diveplanner.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="145"/>
-        <source>30ft</source>
+        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <source>Bottom SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="146"/>
-        <source>Increase maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <source>SAC on DECO Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="147"/>
-        <source>Decreases maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <source>Increase minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>10min</source>
+        <location filename="../qt-ui/diveplanner.ui" line="108"/>
+        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>Decreases minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <source>Last Stop at 6m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
-        <source>Handler Position Error</source>
+        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="386"/>
-        <source>One or more of your stops will be lost with this operations, 
-Please, remove them first.</source>
+        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <source>ATM Pressure</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DivePlannerGraphics</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <source>10m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="136"/>
+        <source>30ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <source>Handler Position Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="415"/>
-        <source>Air</source>
+        <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>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="420"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="421"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="424"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="425"/>
-        <source>Air</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <source>AIR</source>
+        <translation type="unfinished">Luft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="986"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="987"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
         <translation type="unfinished">Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="988"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="989"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1141"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1142"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2591,75 +2709,85 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="851"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="937"/>
+        <source>Available Gases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <source>add dive data point</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1051"/>
+        <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
         <translation type="unfinished">Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1052"/>
+        <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
         <translation type="unfinished">Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
         <translation type="unfinished">m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
         <translation type="unfinished">ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1055"/>
+        <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
         <translation type="unfinished">min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
         <translation type="unfinished">US Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1058"/>
+        <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
         <translation type="unfinished">Anzug</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1059"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
         <translation type="unfinished">Flasche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1061"/>
+        <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
         <translation type="unfinished">SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1062"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1063"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
         <translation type="unfinished">max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1064"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
         <translation type="unfinished">Ort</translation>
     </message>
@@ -2667,14 +2795,20 @@ Please, remove them first.</source>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="138"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
         <translation type="unfinished">Fehler</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="142"/>
-        <source>retry</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
+        <source>Retry</source>
+        <translation type="unfinished">Wiederholen</translation>
     </message>
 </context>
 <context>
@@ -2734,6 +2868,7 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
         <translation type="unfinished">Notizen</translation>
     </message>
@@ -2748,225 +2883,238 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <source>M/d/yy h:mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="108"/>
-        <location filename="../qt-ui/maintab.cpp" line="307"/>
+        <location filename="../qt-ui/maintab.ui" line="112"/>
+        <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
         <translation type="unfinished">Ort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="122"/>
+        <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="136"/>
+        <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
         <translation type="unfinished">Tauchguide</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="143"/>
+        <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
         <translation type="unfinished">Partner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="166"/>
+        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
         <translation type="unfinished">Bewertung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="173"/>
+        <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
         <translation type="unfinished">Sicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="182"/>
+        <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
         <translation type="unfinished">Anzug</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="206"/>
-        <location filename="../qt-ui/maintab.cpp" line="308"/>
+        <location filename="../qt-ui/maintab.ui" line="217"/>
+        <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
         <translation type="unfinished">Notizen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="232"/>
+        <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
         <translation type="unfinished">Ausrüstung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="319"/>
+        <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
         <translation type="unfinished">Informationen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="361"/>
+        <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
         <translation type="unfinished">Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="380"/>
+        <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="399"/>
+        <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="418"/>
+        <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="437"/>
-        <location filename="../qt-ui/maintab.ui" line="692"/>
+        <location filename="../qt-ui/maintab.ui" line="466"/>
+        <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
         <translation type="unfinished">SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="456"/>
+        <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="475"/>
+        <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="494"/>
+        <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="513"/>
+        <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="532"/>
+        <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="551"/>
+        <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="570"/>
+        <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
         <translation type="unfinished">Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="589"/>
+        <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
         <translation type="unfinished">Statistiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="668"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation type="unfinished">Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="680"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation type="unfinished">Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="704"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation type="unfinished">Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="716"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation type="unfinished">Gesamtzeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="735"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation type="unfinished">Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="68"/>
+        <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
         <translation type="unfinished">Flaschen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="129"/>
-        <location filename="../qt-ui/maintab.cpp" line="131"/>
-        <source>This trip is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <source>Trip Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="137"/>
-        <location filename="../qt-ui/maintab.cpp" line="139"/>
-        <source>This dive is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="296"/>
+        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <source>Trip Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="286"/>
-        <source>Trip Location</source>
+        <location filename="../qt-ui/maintab.cpp" line="134"/>
+        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="288"/>
-        <source>Trip Notes</source>
+        <location filename="../qt-ui/maintab.cpp" line="143"/>
+        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
-        <location filename="../qt-ui/maintab.cpp" line="337"/>
-        <location filename="../qt-ui/maintab.cpp" line="338"/>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="146"/>
+        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <source>This dive is being edited. Select Save or Cancel when done.</source>
+        <translation type="unfinished"></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"/>
         <source>/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <source>unknown</source>
+        <translation type="unfinished">unbekannt</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
         <translation type="unfinished">N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
         <translation type="unfinished">S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
         <translation type="unfinished">O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
         <translation type="unfinished">W</translation>
     </message>
@@ -2979,308 +3127,432 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="177"/>
         <source>File</source>
-        <translation type="unfinished">Datei</translation>
+        <translation type="obsolete">Datei</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="196"/>
         <source>Log</source>
-        <translation type="unfinished">Log</translation>
+        <translation type="obsolete">Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="211"/>
         <source>View</source>
-        <translation type="unfinished">Ansicht</translation>
+        <translation type="obsolete">Ansicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="226"/>
+        <location filename="../qt-ui/mainwindow.ui" line="218"/>
         <source>Filter</source>
         <translation type="unfinished">Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="232"/>
         <source>Help</source>
-        <translation type="unfinished">Hilfe</translation>
+        <translation type="obsolete">Hilfe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="245"/>
+        <location filename="../qt-ui/mainwindow.ui" line="177"/>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <source>&amp;Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <source>&amp;View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <source>&amp;Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>&amp;New logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
         <translation type="unfinished">Neu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <source>&amp;Open logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="256"/>
+        <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
+        <location filename="../qt-ui/mainwindow.ui" line="281"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation type="unfinished">Speichern unter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
+        <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="277"/>
+        <location filename="../qt-ui/mainwindow.ui" line="292"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation type="unfinished">Schliessen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="285"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="176"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <source>Export UDDF</source>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <source>Export &amp;UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
-        <source>Print</source>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <source>Ctrl+U</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="301"/>
-        <source>Ctrl+P</source>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <source>&amp;Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
-        <source>Preferences</source>
-        <translation type="unfinished">Einstellungen</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <source>Ctrl+,</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="311"/>
-        <source>Quit</source>
-        <translation type="unfinished">Beenden</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
-        <source>Ctrl+Q</source>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <source>Import from &amp;dive computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <source>Download from Dive computer</source>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
-        <source>Ctrl+D</source>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <source>Ctrl+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="327"/>
-        <source>Download from Web Service</source>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <source>&amp;Edit Device Names</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="332"/>
-        <source>Edit Device Names</source>
-        <translation type="unfinished">Gerätename bearbeiten</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <source>Ctrl++</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="337"/>
-        <source>Add Dive</source>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <source>&amp;Renumber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
-        <source>Renumber</source>
-        <translation type="unfinished">Neu nummerieren</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Ctrl+R</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
-        <source>Auto Group</source>
+        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <source>Toggle &amp;Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
-        <source>Toggle Zoom</source>
-        <translation type="unfinished">Zoom ein-/ausschalten</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <source>&amp;Yearly Statistics</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
-        <source>Yearly Statistics</source>
-        <translation type="unfinished">Jahresstatistiken</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <source>Ctrl+Y</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
-        <source>View List</source>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Dive List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="365"/>
-        <source>Ctrl+2</source>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <source>Profile</source>
+        <translation type="unfinished">Profil</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <source>Info</source>
+        <translation type="unfinished">Informationen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
-        <source>View Profile</source>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <source>User &amp;Manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="373"/>
-        <source>Ctrl+3</source>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <source>Globe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
-        <source>View Info</source>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <source>P&amp;lan Dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="381"/>
-        <source>Ctrl+4</source>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <source>Ctrl+L</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <source>Import CSV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <source>Import CS&amp;V</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <source>Import from Divelogs.de</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <source>Preferences</source>
+        <translation type="unfinished">Einstellungen</translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="obsolete">Beenden</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <source>Ctrl+D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Device Names</source>
+        <translation type="obsolete">Gerätename bearbeiten</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <source>Add Dive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Renumber</source>
+        <translation type="obsolete">Neu nummerieren</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/mainwindow.ui" line="386"/>
-        <source>View All</source>
+        <source>Auto Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="389"/>
+        <source>Toggle Zoom</source>
+        <translation type="obsolete">Zoom ein-/ausschalten</translation>
+    </message>
+    <message>
+        <source>Yearly Statistics</source>
+        <translation type="obsolete">Jahresstatistiken</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <source>Ctrl+2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <source>Ctrl+3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <source>Ctrl+4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>Ctrl+1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Prev DC</source>
         <translation type="unfinished">Vorh. TC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
+        <location filename="../qt-ui/mainwindow.ui" line="439"/>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="402"/>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Next DC</source>
         <translation type="unfinished">Nächster TC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="405"/>
+        <location filename="../qt-ui/mainwindow.ui" line="447"/>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="410"/>
+        <location filename="../qt-ui/mainwindow.ui" line="452"/>
         <source>Select Events</source>
         <translation type="unfinished">Ereignisse auswählen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
         <source>Input Plan</source>
         <translation type="unfinished">Plan eingeben</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
         <source>About Subsurface</source>
         <translation type="unfinished">Info zu Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>User Manual</source>
-        <translation type="unfinished">Benutzerhandbuch</translation>
+        <translation type="obsolete">Benutzerhandbuch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>F1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="433"/>
-        <source>View Globe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="478"/>
         <source>Ctrl+5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="441"/>
-        <source>Dive Planner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="108"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Open File</source>
         <translation type="unfinished">Datei öffnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="271"/>
-        <source>manually added dive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="448"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="450"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="455"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
         <translation type="unfinished">Änderungen speichern?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="456"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="695"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="696"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="144"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="250"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="286"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="197"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3343,215 +3615,235 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="218"/>
+        <location filename="../qt-ui/preferences.ui" line="199"/>
+        <source>Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="205"/>
+        <source>Use Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="225"/>
+        <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="235"/>
+        <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="245"/>
+        <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="269"/>
+        <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
         <translation type="unfinished">Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="276"/>
+        <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
         <translation type="unfinished">Meter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="286"/>
+        <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
         <translation type="unfinished">Fuss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
         <translation type="unfinished">Druck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="303"/>
+        <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
         <translation type="unfinished">bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="313"/>
+        <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="330"/>
+        <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
         <translation type="unfinished">Liter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="340"/>
+        <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
         <translation type="unfinished">cuft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="350"/>
+        <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
         <translation type="unfinished">Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="357"/>
+        <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
         <translation type="unfinished">Celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
         <translation type="unfinished">Fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="377"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
         <translation type="unfinished">Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
         <translation type="unfinished">US Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="464"/>
+        <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="472"/>
+        <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="495"/>
-        <location filename="../qt-ui/preferences.ui" line="536"/>
-        <location filename="../qt-ui/preferences.ui" line="577"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="513"/>
+        <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="554"/>
+        <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="595"/>
+        <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="618"/>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="634"/>
+        <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="643"/>
+        <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="666"/>
+        <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="677"/>
+        <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="700"/>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="710"/>
+        <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="721"/>
-        <source>Show time</source>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
+        <source>Calculate NDL/TTS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="733"/>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>Show SAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
+        <source>GFLow at max depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="739"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
-        <source>XML Files (*.xml)</source>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3689,51 +3981,86 @@ Please, remove them first.</source>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="257"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="259"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <source>Hide events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <source>Hide all %1 events?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <source>Remove the selected event?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <source>%1 @ %2:%3</source>
+        <translation type="unfinished"></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>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="337"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="383"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="384"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="582"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="850"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <source>Measure properties of dive segments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
+        <source>Scale your dive to screen size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
+        <source>Edit</source>
+        <translation type="unfinished">Bearbeiten</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
         <translation type="unfinished">Luft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="584"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="851"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="859"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
         <translation type="unfinished">Notausstieg mit offenem System</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="861"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished"> Anfang</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="862"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished"> Ende</translation>
@@ -3742,62 +4069,62 @@ Please, remove them first.</source>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1497"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
         <translation type="unfinished">unbekannt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1502"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1505"/>
+        <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1512"/>
+        <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1517"/>
+        <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
         <translation type="unfinished">Flasche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1519"/>
+        <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
         <translation type="unfinished">Gasgemisch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1547"/>
+        <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
         <translation type="unfinished">SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1549"/>
+        <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
         <translation type="unfinished">Max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1551"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1564"/>
+        <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1570"/>
+        <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3806,30 +4133,30 @@ Please, remove them first.</source>
     <name>QObject</name>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="44"/>
         <source>AIR</source>
         <translation type="unfinished">Luft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="38"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="45"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="723"/>
+        <source>Remove this Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>EAN32</source>
-        <translation type="unfinished">EAN32</translation>
+        <translation type="obsolete">EAN32</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="46"/>
         <source>EAN36</source>
-        <translation type="unfinished">EAN36</translation>
+        <translation type="obsolete">EAN36</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="47"/>
-        <source>Choose Gas</source>
+        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <source>No location data - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="188"/>
-        <source>No location data - move the map and double-click to set the dive location</source>
+        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3838,17 +4165,17 @@ Please, remove them first.</source>
         <translation type="unfinished">Schliessen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="26"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation type="unfinished">Ø</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="29"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation type="unfinished">Min.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation type="unfinished">Max.</translation>
     </message>
@@ -3867,92 +4194,95 @@ Please, remove them first.</source>
     </message>
 </context>
 <context>
-    <name>SubsurfaceAbout</name>
+    <name>ShiftTimesDialog</name>
     <message>
-        <location filename="../qt-ui/about.ui" line="23"/>
-        <source>About Subsurface</source>
-        <translation type="unfinished">Info zu Subsurface</translation>
+        <location filename="../qt-ui/shifttimes.ui" line="14"/>
+        <source>Shift selected times</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
+        <location filename="../qt-ui/shifttimes.ui" line="35"/>
+        <source>Shift times of selected dives by</source>
         <translation type="unfinished"></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>
+        <location filename="../qt-ui/shifttimes.ui" line="80"/>
+        <source>h:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="22"/>
-        <source>&amp;License</source>
+        <location filename="../qt-ui/shifttimes.ui" line="90"/>
+        <source>earlier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
-        <source>&amp;Website</source>
+        <location filename="../qt-ui/shifttimes.ui" line="97"/>
+        <source>later</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SubsurfaceWebServices</name>
+    <name>SubsurfaceAbout</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="14"/>
-        <source>Download Location Data</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/about.ui" line="23"/>
+        <source>About Subsurface</source>
+        <translation type="unfinished">Info zu Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="37"/>
-        <source>Download</source>
+        <location filename="../qt-ui/about.ui" line="64"/>
+        <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="44"/>
-        <source>Enter your ID here</source>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="51"/>
-        <source>User ID</source>
+        <location filename="../qt-ui/about.cpp" line="22"/>
+        <source>&amp;License</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="58"/>
-        <source>Status:</source>
+        <location filename="../qt-ui/about.cpp" line="23"/>
+        <source>&amp;Website</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="49"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
         <translation type="unfinished">Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="90"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="106"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="130"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
         <translation type="unfinished">Verbindungsfehler: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
         <translation type="unfinished">Ungültige Benutzerkennung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
         <translation type="unfinished">Verstehe die Antwort nicht!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="133"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
         <translation type="unfinished">Erfolgreich geladen!</translation>
     </message>
@@ -3973,17 +4303,17 @@ Please, remove them first.</source>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Bar</source>
         <translation type="unfinished">bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3991,7 +4321,7 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1393"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3999,96 +4329,139 @@ Please, remove them first.</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>WebServices</name>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="14"/>
+        <source>Download Location Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="20"/>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="27"/>
+        <source>Enter your ID here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="34"/>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="58"/>
+        <source>User ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="72"/>
+        <source>Password</source>
+        <translation type="unfinished">Passwort</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="86"/>
+        <source>Upload</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
         <translation type="unfinished">Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
         <translation type="unfinished">Gewicht</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="460"/>
+        <source>Clicking here will remove this weigthsystem.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
- &gt; Month</source>
+ &gt; Month / Trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
         <translation type="unfinished">Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1307"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1310"/>
+        <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1311"/>
+        <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1312"/>
-        <location filename="../qt-ui/models.cpp" line="1315"/>
-        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <location filename="../qt-ui/models.cpp" line="1418"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1313"/>
-        <location filename="../qt-ui/models.cpp" line="1316"/>
-        <location filename="../qt-ui/models.cpp" line="1319"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"></translation>
@@ -4097,91 +4470,74 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="44"/>
+        <location filename="../dive.c" line="57"/>
         <source>pascal</source>
         <translation type="unfinished">Pa</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="48"/>
-        <location filename="../qt-gui.cpp" line="323"/>
+        <location filename="../dive.c" line="61"/>
+        <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
         <translation type="unfinished">bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="52"/>
-        <location filename="../qt-gui.cpp" line="326"/>
+        <location filename="../dive.c" line="65"/>
+        <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
         <translation type="unfinished">psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="88"/>
-        <location filename="../qt-gui.cpp" line="304"/>
+        <location filename="../dive.c" line="101"/>
+        <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
         <translation type="unfinished">l</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="93"/>
-        <location filename="../qt-gui.cpp" line="307"/>
+        <location filename="../dive.c" line="106"/>
+        <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
         <translation type="unfinished">cuft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="121"/>
-        <location filename="../qt-gui.cpp" line="207"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
         <translation type="unfinished">m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="126"/>
-        <location filename="../qt-gui.cpp" line="210"/>
+        <location filename="../dive.c" line="139"/>
+        <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
         <translation type="unfinished">ft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="170"/>
-        <location filename="../qt-gui.cpp" line="233"/>
+        <location filename="../dive.c" line="183"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
         <translation type="unfinished">US Pfund</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
-        <location filename="../qt-gui.cpp" line="231"/>
+        <location filename="../dive.c" line="187"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="966"/>
+        <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
         <translation type="unfinished">(%s) oder (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="473"/>
         <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <translation type="unfinished">%1$s %3$d. %2$s %4$d %5$02d:%6$02d</translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="490"/>
-        <source>%1$s %2$d, %3$d
-%4$02d:%5$02d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="512"/>
-        <source>%1$s %2$d (%3$d dives)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="519"/>
-        <source>%1$s %2$d (1 dive)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">%1$s %3$d. %2$s %4$d %5$02d:%6$02d</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="550"/>
-        <location filename="../planner.c" line="94"/>
-        <location filename="../planner.c" line="748"/>
-        <location filename="../planner.c" line="749"/>
-        <location filename="../statistics.c" line="360"/>
-        <location filename="../statistics.c" line="371"/>
+        <location filename="../divelist.c" line="488"/>
+        <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"/>
         <source>air</source>
         <translation type="unfinished">Luft</translation>
     </message>
@@ -4211,312 +4567,324 @@ Maximum</source>
         <translation type="unfinished">clip-on</translation>
     </message>
     <message>
-        <location filename="../file.c" line="106"/>
-        <location filename="../file.c" line="108"/>
-        <location filename="../file.c" line="303"/>
-        <location filename="../file.c" line="305"/>
+        <location filename="../file.c" line="107"/>
+        <location filename="../file.c" line="109"/>
+        <location filename="../file.c" line="308"/>
+        <location filename="../file.c" line="310"/>
+        <location filename="../file.c" line="390"/>
+        <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation type="unfinished">Fehler beim Lesen von &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <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>
+    </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>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
         <translation type="unfinished">keine</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
         <translation type="unfinished">Deko-Stopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
         <translation type="unfinished">rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
         <translation type="unfinished">Aufstieg</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
         <translation type="unfinished">tiefster Deko-Stopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
         <translation type="unfinished">Arbeit</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
         <translation type="unfinished">Sender</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
         <translation type="unfinished">Verletzung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
         <translation type="unfinished">Markierung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
         <translation type="unfinished">Oberfläche</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
         <translation type="unfinished">Sicherheitsstopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
         <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
         <translation type="unfinished">Gaswechsel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
         <translation type="unfinished">Sicherheitsstopp (freiwillig)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
         <translation type="unfinished">Sicherheitsstopp (obligatorisch)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
         <translation type="unfinished">Tiefen-Stopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
         <translation type="unfinished">Sicherheits-Stopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
         <translation type="unfinished">Tauchgangsdauer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
         <translation type="unfinished">Max. Tiefe</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
         <translation type="unfinished">OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
         <translation type="unfinished">PO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
         <translation type="unfinished">verbleibende Atemzeit</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
         <translation type="unfinished">rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
         <translation type="unfinished">Richtung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
         <translation type="unfinished">Gewebewarnung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
         <translation type="unfinished">Nullzeit</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="157"/>
+        <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
         <translation type="unfinished">ungültige Ereignisnummer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="390"/>
+        <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
         <translation type="unfinished">Nicht in der Lage, einen Parser für %s %s zu erstellen</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="396"/>
+        <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
         <translation type="unfinished">Fehler beim Registrieren der Daten</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="405"/>
+        <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
         <translation type="unfinished">Fehler beim Lesen des Datums</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
         <translation type="unfinished">Tauchgang Nr. %d: %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="427"/>
+        <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
         <translation type="unfinished">Fehler beim Lesen der Dauer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="437"/>
+        <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
         <translation type="unfinished">Fehler beim Lesen der maximalen Tiefe</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="447"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
         <translation type="unfinished">Fehler beim Lesen der Gasgemischszahl</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
         <translation type="unfinished">Fehler beim Lesen des Salzgehalts</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="469"/>
+        <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
         <translation type="unfinished">Fehler beim Lesen der Gasgemischs</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
         <translation type="unfinished">Fehler beim Lesen der Samples</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="613"/>
+        <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
         <translation type="unfinished">Ereignis: warte auf Benutzeraktion</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="621"/>
+        <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation type="unfinished">model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="663"/>
+        <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
         <translation type="unfinished">Fehler beim Registrieren der Ereignisbehandlung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="668"/>
+        <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished">Fehler bei der Registrierung der Abbruchbehandlung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="672"/>
+        <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
         <translation type="unfinished">Fehler beim Importieren der Tauchgangsdaten</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="690"/>
+        <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished">Fehler beim Erzeugen des libdivecomputer Contexts</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished">Fehler beim Öffnen von %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="549"/>
+        <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
         <translation type="unfinished">Unverständliche Prozentangabe %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1695"/>
+        <location filename="../parse-xml.c" line="1717"/>
         <source>Failed to parse &apos;%s&apos;.
 </source>
         <translation type="unfinished">Fehler beim Lesen von &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1696"/>
+        <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation type="unfinished">Fehler beim Lesen von &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1894"/>
+        <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
         <translation type="unfinished">Datenbank Anfrage der Events fehlgeschlagen.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1929"/>
+        <location filename="../parse-xml.c" line="1951"/>
         <source>Database connection failed &apos;%s&apos;.
 </source>
         <translation type="unfinished">Datenbank Verbindung fehlgeschlagen &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1936"/>
+        <location filename="../parse-xml.c" line="1958"/>
         <source>Database query failed &apos;%s&apos;.
 </source>
         <translation type="unfinished">Datenbank Anfrage fehlgeschlagen &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2048"/>
+        <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
         <translation type="unfinished">Fehler beim Öffnen des Styleshhets (%s)/%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="96"/>
-        <location filename="../statistics.c" line="363"/>
+        <location filename="../planner.c" line="98"/>
+        <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
         <translation type="unfinished">EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="131"/>
+        <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation type="unfinished">Kann Gasgemisch %d/%d nicht finden</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="192"/>
         <source>Cylinder for planning</source>
-        <translation type="unfinished">Flasche für Tauchplanung</translation>
+        <translation type="obsolete">Flasche für Tauchplanung</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="217"/>
         <source>Simulated Dive</source>
-        <translation type="unfinished">Simulierter Tauchgang</translation>
+        <translation type="obsolete">Simulierter Tauchgang</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="294"/>
+        <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
         <translation type="unfinished">Zu viele Gasgemische</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="472"/>
+        <location filename="../planner.c" line="493"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -4529,180 +4897,173 @@ basierend auf GFlow = %.0f und GFhigh = %.0f
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="513"/>
+        <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished">Auftauchen auf %.*f %s in %d:%02d min - Gesamtzeit %d:%02u mit %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="522"/>
+        <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished">Verbleibe auf %.*f %s für %d:%02d min - Gesamtzeit %d:%02u mit %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
         <translation type="unfinished">Gaswechsel zu %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
         <translation type="unfinished">Gasverbrauch:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="552"/>
+        <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
         <translation type="unfinished">%.0f%s %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="776"/>
         <source>ean</source>
         <translation type="unfinished">ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1154"/>
         <source>D:%.1f %s</source>
-        <translation type="unfinished">T:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1158"/>
-        <source>%s
-T:%d:%02d</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">T:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
         <translation type="unfinished">%s
 D:%d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
         <translation type="unfinished">%s
 T:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1177"/>
+        <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation type="unfinished">%s
 Berechneter tiefster Deko-Stopp %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1189"/>
+        <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation type="unfinished">%s
 Sicherheitsstopp:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1199"/>
+        <source>@:%d:%02d
+D:%.1f %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1219"/>
+        <source>%s
+SAC:%2.1fl/min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation type="unfinished">%s
 Sicherheitsstopp:unbk Zeit @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation type="unfinished">%s
 Deko:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1211"/>
+        <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation type="unfinished">%s
 Deko:unbk Zeit @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1217"/>
+        <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
         <translation type="unfinished">%s
 In Deko</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
-        <source>%s
-NDL:-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1275"/>
         <source>%s
 NDL:%umin</source>
         <translation type="unfinished">%s
 NDL:%umin</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
-        <source>%s
-TTS:%umin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1223"/>
         <source>%s
 CNS:%u%%</source>
         <translation type="unfinished">%s
 CNS:%u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1227"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation type="unfinished">%s
 pO%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1231"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation type="unfinished">%s
 pN%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1243"/>
+        <location filename="../profile.c" line="1235"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation type="unfinished">%s
 pHe:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1240"/>
         <source>%s
 MOD:%d%s</source>
         <translation type="unfinished">%s
 MOD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1247"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -4713,295 +5074,346 @@ END:%d%s
 EADD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1349"/>
+        <location filename="../profile.c" line="1280"/>
+        <source>%s
+Deco:%umin @ %.0f %s (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1289"/>
+        <source>%s
+In deco (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>%s
+NDL:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1296"/>
+        <source>%s
+TTS:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
-        <location filename="../profile.c" line="1357"/>
+        <location filename="../profile.c" line="1409"/>
+        <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1361"/>
+        <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1365"/>
+        <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1369"/>
-        <source>%s%sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1425"/>
+        <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1373"/>
-        <location filename="../profile.c" line="1377"/>
-        <source>%s %sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1429"/>
+        <location filename="../profile.c" line="1433"/>
+        <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1384"/>
+        <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="284"/>
+        <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="288"/>
+        <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../qt-gui.cpp" line="460"/>
+        <source>%1, %2 %3, %4 %5:%6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="473"/>
+        <source>%1 %2, %3
+%4:%5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="486"/>
+        <source>%1 %2 (%3 dives)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="491"/>
+        <source>%1 %2 (1 dive)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>invalid</source>
-        <translation type="unfinished">ungültig</translation>
+        <translation type="obsolete">ungültig</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>boat</source>
         <translation type="unfinished">Boot</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>shore</source>
         <translation type="unfinished">Ufer</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>drift</source>
         <translation type="unfinished">Strömung</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>deep</source>
         <translation type="unfinished">Tief</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>cavern</source>
         <translation type="unfinished">Kaverne</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="14"/>
         <source>ice</source>
         <translation type="unfinished">Eis</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>wreck</source>
         <translation type="unfinished">Wrack</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>cave</source>
         <translation type="unfinished">Höhle</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>altitude</source>
         <translation type="unfinished">Berg</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>pool</source>
         <translation type="unfinished">Pool</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>lake</source>
         <translation type="unfinished">See</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="16"/>
         <source>river</source>
         <translation type="unfinished">Fluss</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="17"/>
         <source>night</source>
         <translation type="unfinished">Nacht</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="17"/>
+        <source>fresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="17"/>
+        <source>student</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>freshwater</source>
-        <translation type="unfinished">Süsswasser</translation>
+        <translation type="obsolete">Süsswasser</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
         <source>training</source>
-        <translation type="unfinished">Übung</translation>
+        <translation type="obsolete">Übung</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
         <source>teaching</source>
-        <translation type="unfinished">Unterricht</translation>
+        <translation type="obsolete">Unterricht</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
         <source>photo</source>
         <translation type="unfinished">Foto</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
         <source>video</source>
         <translation type="unfinished">Video</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
+        <source>instructor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="19"/>
         <source>deco</source>
         <translation type="unfinished">deko</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="199"/>
+        <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
         <translation type="unfinished">mehr als %d Tage</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="205"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation type="unfinished">%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="207"/>
+        <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
         <translation type="unfinished">%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="218"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation type="unfinished">für Tauchgänge Nr.</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="225"/>
+        <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
         <translation type="unfinished">für die ausgewählten Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="260"/>
+        <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
         <translation type="unfinished">für Tauchgang Nr. %d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="262"/>
+        <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
         <translation type="unfinished">für den ausgewählten Tauchgang</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="264"/>
+        <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
         <translation type="unfinished">für alle Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="266"/>
+        <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
         <translation type="unfinished">(keine Tauchgänge)</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="363"/>
-        <source>, EAN%d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
         <translation type="unfinished">So</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
         <translation type="unfinished">Mo</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
         <translation type="unfinished">Di</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
         <translation type="unfinished">Mi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
         <translation type="unfinished">Do</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
         <translation type="unfinished">Fr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
         <translation type="unfinished">Sa</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
         <translation type="unfinished">Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
         <translation type="unfinished">Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
         <translation type="unfinished">Mär</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
         <translation type="unfinished">Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
         <translation type="unfinished">Mai</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
         <translation type="unfinished">Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
         <translation type="unfinished">Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
         <translation type="unfinished">Aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
         <translation type="unfinished">Sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
         <translation type="unfinished">Okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
         <translation type="unfinished">Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
         <translation type="unfinished">Dez</translation>
     </message>
diff --git a/translations/subsurface_de_DE.ts b/translations/subsurface_de_DE.ts
index df33d3072..6bd538c25 100644
--- a/translations/subsurface_de_DE.ts
+++ b/translations/subsurface_de_DE.ts
@@ -2314,42 +2314,135 @@ tranlators here
     </message>
 </context>
 <context>
+    <name>CSVImportDialog</name>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <source>Import File (CSV)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <source>Field Separator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <source>Field Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <source>Time</source>
+        <translation type="unfinished">Zeit</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <source>Depth</source>
+        <translation type="unfinished">Tiefe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <source>Temp</source>
+        <translation type="unfinished">Temperatur</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
+        <source>Po2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <source>Cns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <source>Stopdepth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <source>Pre-configured imports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>Open CSV Log File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>CSV Files (*.csv)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
         <translation type="unfinished">Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
         <translation type="unfinished">Größe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="65"/>
+        <source>Switch at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="163"/>
+        <source>Clicking here will remove this cylinder.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="385"/>
+        <source>Cylinder cannot be removed</source>
+        <translation type="unfinished"></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>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
@@ -2373,30 +2466,35 @@ tranlators here
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Device ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Model</source>
         <translation type="unfinished">Modell</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
         <translation type="unfinished">Gerätename</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <source>Clicking here will remove this divecomputer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1009"/>
+        <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1011"/>
+        <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2404,186 +2502,206 @@ tranlators here
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="39"/>
+        <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="398"/>
+        <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="399"/>
+        <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="400"/>
-        <source>collapse</source>
+        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <source>collapse others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="402"/>
-        <source>remove dive from trip</source>
+        <location filename="../qt-ui/divelistview.cpp" line="638"/>
+        <source>remove dive(s) from trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="405"/>
-        <source>Merge trip with trip above</source>
-        <translation type="unfinished">Reise mit der darüber verbinden</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="639"/>
+        <source>create new trip above</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="406"/>
-        <source>Merge trip with trip below</source>
-        <translation type="unfinished">Reise mit der darunter verbinden</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="640"/>
+        <source>add dive(s) to trip immideately above</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="410"/>
-        <source>delete dive</source>
+        <location filename="../qt-ui/divelistview.cpp" line="643"/>
+        <source>merge trip with trip above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="412"/>
-        <source>merge selected dives</source>
+        <location filename="../qt-ui/divelistview.cpp" line="644"/>
+        <source>merge trip with trip below</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../qt-ui/divelistview.cpp" line="648"/>
+        <source>delete dive(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
-        <source>Bottom SAC</source>
+        <location filename="../qt-ui/divelistview.cpp" line="652"/>
+        <source>save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
-        <source>High GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="653"/>
+        <source>export As UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
-        <source>SAC on DECO Stop</source>
+        <location filename="../qt-ui/divelistview.cpp" line="654"/>
+        <source>shift times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
-        <source>Low GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
+        <source>Save Dives As...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="114"/>
-        <source>Last Stop at 6m</source>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
+        <source>Save File as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="141"/>
-        <source>Start Time</source>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="148"/>
-        <source>ATM Pressure</source>
+        <source>Merge trip with trip above</source>
+        <translation type="obsolete">Reise mit der darüber verbinden</translation>
+    </message>
+    <message>
+        <source>Merge trip with trip below</source>
+        <translation type="obsolete">Reise mit der darunter verbinden</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <source>merge selected dives</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DivePlannerGraphics</name>
+    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="143"/>
-        <source>10m</source>
+        <location filename="../qt-ui/diveplanner.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="145"/>
-        <source>30ft</source>
+        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <source>Bottom SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="146"/>
-        <source>Increase maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <source>SAC on DECO Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="147"/>
-        <source>Decreases maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <source>Increase minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>10min</source>
+        <location filename="../qt-ui/diveplanner.ui" line="108"/>
+        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>Decreases minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <source>Last Stop at 6m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
-        <source>Handler Position Error</source>
+        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="386"/>
-        <source>One or more of your stops will be lost with this operations, 
-Please, remove them first.</source>
+        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <source>ATM Pressure</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DivePlannerGraphics</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <source>10m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="136"/>
+        <source>30ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <source>Handler Position Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="415"/>
-        <source>Air</source>
+        <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>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="420"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="421"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="424"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="425"/>
-        <source>Air</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <source>AIR</source>
+        <translation type="unfinished">Luft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="986"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="987"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
         <translation type="unfinished">Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="988"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="989"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1141"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1142"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2591,75 +2709,85 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="851"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="937"/>
+        <source>Available Gases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <source>add dive data point</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1051"/>
+        <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
         <translation type="unfinished">Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1052"/>
+        <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
         <translation type="unfinished">Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
         <translation type="unfinished">m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
         <translation type="unfinished">ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1055"/>
+        <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
         <translation type="unfinished">min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
         <translation type="unfinished">US Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1058"/>
+        <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
         <translation type="unfinished">Anzug</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1059"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
         <translation type="unfinished">Flasche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1061"/>
+        <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
         <translation type="unfinished">AMV</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1062"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1063"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
         <translation type="unfinished">max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1064"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
         <translation type="unfinished">Ort</translation>
     </message>
@@ -2667,14 +2795,20 @@ Please, remove them first.</source>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="138"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
         <translation type="unfinished">Fehler</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="142"/>
-        <source>retry</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
+        <source>Retry</source>
+        <translation type="unfinished">Wiederholen</translation>
     </message>
 </context>
 <context>
@@ -2734,6 +2868,7 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
         <translation type="unfinished">Notizen</translation>
     </message>
@@ -2748,225 +2883,238 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <source>M/d/yy h:mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="108"/>
-        <location filename="../qt-ui/maintab.cpp" line="307"/>
+        <location filename="../qt-ui/maintab.ui" line="112"/>
+        <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
         <translation type="unfinished">Ort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="122"/>
+        <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="136"/>
+        <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
         <translation type="unfinished">Tauchgruppenleiter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="143"/>
+        <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
         <translation type="unfinished">Partner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="166"/>
+        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
         <translation type="unfinished">Bewertung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="173"/>
+        <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
         <translation type="unfinished">Sicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="182"/>
+        <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
         <translation type="unfinished">Anzug</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="206"/>
-        <location filename="../qt-ui/maintab.cpp" line="308"/>
+        <location filename="../qt-ui/maintab.ui" line="217"/>
+        <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
         <translation type="unfinished">Notizen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="232"/>
+        <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
         <translation type="unfinished">Ausrüstung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="319"/>
+        <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
         <translation type="unfinished">Informationen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="361"/>
+        <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
         <translation type="unfinished">Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="380"/>
+        <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="399"/>
+        <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="418"/>
+        <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="437"/>
-        <location filename="../qt-ui/maintab.ui" line="692"/>
+        <location filename="../qt-ui/maintab.ui" line="466"/>
+        <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
         <translation type="unfinished">AMV</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="456"/>
+        <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="475"/>
+        <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="494"/>
+        <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="513"/>
+        <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="532"/>
+        <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="551"/>
+        <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="570"/>
+        <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
         <translation type="unfinished">Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="589"/>
+        <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
         <translation type="unfinished">Statistiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="668"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation type="unfinished">Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="680"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation type="unfinished">Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="704"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation type="unfinished">Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="716"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation type="unfinished">Gesamtzeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="735"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation type="unfinished">Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="68"/>
+        <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
         <translation type="unfinished">Flaschen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="129"/>
-        <location filename="../qt-ui/maintab.cpp" line="131"/>
-        <source>This trip is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <source>Trip Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="137"/>
-        <location filename="../qt-ui/maintab.cpp" line="139"/>
-        <source>This dive is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="296"/>
+        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <source>Trip Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="286"/>
-        <source>Trip Location</source>
+        <location filename="../qt-ui/maintab.cpp" line="134"/>
+        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="288"/>
-        <source>Trip Notes</source>
+        <location filename="../qt-ui/maintab.cpp" line="143"/>
+        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
-        <location filename="../qt-ui/maintab.cpp" line="337"/>
-        <location filename="../qt-ui/maintab.cpp" line="338"/>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="146"/>
+        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <source>This dive is being edited. Select Save or Cancel when done.</source>
+        <translation type="unfinished"></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"/>
         <source>/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <source>unknown</source>
+        <translation type="unfinished">unbekannt</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
         <translation type="unfinished">N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
         <translation type="unfinished">S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
         <translation type="unfinished">O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
         <translation type="unfinished">W</translation>
     </message>
@@ -2979,308 +3127,432 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="177"/>
         <source>File</source>
-        <translation type="unfinished">Datei</translation>
+        <translation type="obsolete">Datei</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="196"/>
         <source>Log</source>
-        <translation type="unfinished">Log</translation>
+        <translation type="obsolete">Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="211"/>
         <source>View</source>
-        <translation type="unfinished">Ansicht</translation>
+        <translation type="obsolete">Ansicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="226"/>
+        <location filename="../qt-ui/mainwindow.ui" line="218"/>
         <source>Filter</source>
         <translation type="unfinished">Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="232"/>
         <source>Help</source>
-        <translation type="unfinished">Hilfe</translation>
+        <translation type="obsolete">Hilfe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="245"/>
+        <location filename="../qt-ui/mainwindow.ui" line="177"/>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <source>&amp;Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <source>&amp;View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <source>&amp;Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>&amp;New logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
         <translation type="unfinished">Neu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <source>&amp;Open logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="256"/>
+        <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
+        <location filename="../qt-ui/mainwindow.ui" line="281"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation type="unfinished">Speichern unter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
+        <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="277"/>
+        <location filename="../qt-ui/mainwindow.ui" line="292"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation type="unfinished">Schließen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="285"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="176"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <source>Export UDDF</source>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <source>Export &amp;UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
-        <source>Print</source>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <source>Ctrl+U</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="301"/>
-        <source>Ctrl+P</source>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <source>&amp;Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
-        <source>Preferences</source>
-        <translation type="unfinished">Einstellungen</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <source>Ctrl+,</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="311"/>
-        <source>Quit</source>
-        <translation type="unfinished">Beenden</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
-        <source>Ctrl+Q</source>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <source>Import from &amp;dive computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <source>Download from Dive computer</source>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
-        <source>Ctrl+D</source>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <source>Ctrl+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="327"/>
-        <source>Download from Web Service</source>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <source>&amp;Edit Device Names</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="332"/>
-        <source>Edit Device Names</source>
-        <translation type="unfinished">Gerätename bearbeiten</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <source>Ctrl++</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="337"/>
-        <source>Add Dive</source>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <source>&amp;Renumber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
-        <source>Renumber</source>
-        <translation type="unfinished">Neu nummerieren</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Ctrl+R</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
-        <source>Auto Group</source>
+        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <source>Toggle &amp;Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
-        <source>Toggle Zoom</source>
-        <translation type="unfinished">Zoom ein-/ausschalten</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <source>&amp;Yearly Statistics</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
-        <source>Yearly Statistics</source>
-        <translation type="unfinished">Jahresstatistiken</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <source>Ctrl+Y</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
-        <source>View List</source>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Dive List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="365"/>
-        <source>Ctrl+2</source>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <source>Profile</source>
+        <translation type="unfinished">Profil</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <source>Info</source>
+        <translation type="unfinished">Informationen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
-        <source>View Profile</source>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <source>User &amp;Manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="373"/>
-        <source>Ctrl+3</source>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <source>Globe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
-        <source>View Info</source>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <source>P&amp;lan Dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="381"/>
-        <source>Ctrl+4</source>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <source>Ctrl+L</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <source>Import CSV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <source>Import CS&amp;V</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <source>Import from Divelogs.de</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <source>Preferences</source>
+        <translation type="unfinished">Einstellungen</translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="obsolete">Beenden</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <source>Ctrl+D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Device Names</source>
+        <translation type="obsolete">Gerätename bearbeiten</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <source>Add Dive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Renumber</source>
+        <translation type="obsolete">Neu nummerieren</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/mainwindow.ui" line="386"/>
-        <source>View All</source>
+        <source>Auto Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="389"/>
+        <source>Toggle Zoom</source>
+        <translation type="obsolete">Zoom ein-/ausschalten</translation>
+    </message>
+    <message>
+        <source>Yearly Statistics</source>
+        <translation type="obsolete">Jahresstatistiken</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <source>Ctrl+2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <source>Ctrl+3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <source>Ctrl+4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>Ctrl+1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Prev DC</source>
         <translation type="unfinished">Vorh. TC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
+        <location filename="../qt-ui/mainwindow.ui" line="439"/>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="402"/>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Next DC</source>
         <translation type="unfinished">Nächster TC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="405"/>
+        <location filename="../qt-ui/mainwindow.ui" line="447"/>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="410"/>
+        <location filename="../qt-ui/mainwindow.ui" line="452"/>
         <source>Select Events</source>
         <translation type="unfinished">Ereignisse auswählen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
         <source>Input Plan</source>
         <translation type="unfinished">Plan eingeben</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
         <source>About Subsurface</source>
         <translation type="unfinished">Info zu Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>User Manual</source>
-        <translation type="unfinished">Benutzerhandbuch</translation>
+        <translation type="obsolete">Benutzerhandbuch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>F1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="433"/>
-        <source>View Globe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="478"/>
         <source>Ctrl+5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="441"/>
-        <source>Dive Planner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="108"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Open File</source>
         <translation type="unfinished">Datei öffnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="271"/>
-        <source>manually added dive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="448"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="450"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="455"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
         <translation type="unfinished">Änderungen speichern?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="456"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="695"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="696"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="144"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="250"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="286"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="197"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3343,215 +3615,235 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="218"/>
+        <location filename="../qt-ui/preferences.ui" line="199"/>
+        <source>Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="205"/>
+        <source>Use Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="225"/>
+        <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="235"/>
+        <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="245"/>
+        <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="269"/>
+        <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
         <translation type="unfinished">Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="276"/>
+        <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
         <translation type="unfinished">Meter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="286"/>
+        <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
         <translation type="unfinished">Fuß</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
         <translation type="unfinished">Druck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="303"/>
+        <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
         <translation type="unfinished">bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="313"/>
+        <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="330"/>
+        <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
         <translation type="unfinished">Liter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="340"/>
+        <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
         <translation type="unfinished">cuft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="350"/>
+        <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
         <translation type="unfinished">Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="357"/>
+        <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
         <translation type="unfinished">Celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
         <translation type="unfinished">Fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="377"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
         <translation type="unfinished">Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
         <translation type="unfinished">US Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="464"/>
+        <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="472"/>
+        <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="495"/>
-        <location filename="../qt-ui/preferences.ui" line="536"/>
-        <location filename="../qt-ui/preferences.ui" line="577"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="513"/>
+        <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="554"/>
+        <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="595"/>
+        <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="618"/>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="634"/>
+        <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="643"/>
+        <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="666"/>
+        <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="677"/>
+        <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="700"/>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="710"/>
+        <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="721"/>
-        <source>Show time</source>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
+        <source>Calculate NDL/TTS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="733"/>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>Show SAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
+        <source>GFLow at max depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="739"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
-        <source>XML Files (*.xml)</source>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3689,51 +3981,86 @@ Please, remove them first.</source>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="257"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="259"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <source>Hide events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <source>Hide all %1 events?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <source>Remove the selected event?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <source>%1 @ %2:%3</source>
+        <translation type="unfinished"></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>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="337"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="383"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="384"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="582"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="850"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <source>Measure properties of dive segments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
+        <source>Scale your dive to screen size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
+        <source>Edit</source>
+        <translation type="unfinished">Bearbeiten</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
         <translation type="unfinished">Luft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="584"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="851"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="859"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
         <translation type="unfinished">Notausstieg mit offenem System</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="861"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished"> Anfang</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="862"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished"> Ende</translation>
@@ -3742,62 +4069,62 @@ Please, remove them first.</source>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1497"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
         <translation type="unfinished">unbekannt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1502"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1505"/>
+        <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1512"/>
+        <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1517"/>
+        <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
         <translation type="unfinished">Flasche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1519"/>
+        <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
         <translation type="unfinished">Gasgemisch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1547"/>
+        <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
         <translation type="unfinished">AMV</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1549"/>
+        <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
         <translation type="unfinished">Max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1551"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1564"/>
+        <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1570"/>
+        <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3806,30 +4133,30 @@ Please, remove them first.</source>
     <name>QObject</name>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="44"/>
         <source>AIR</source>
         <translation type="unfinished">Luft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="38"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="45"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="723"/>
+        <source>Remove this Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>EAN32</source>
-        <translation type="unfinished">EAN32</translation>
+        <translation type="obsolete">EAN32</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="46"/>
         <source>EAN36</source>
-        <translation type="unfinished">EAN36</translation>
+        <translation type="obsolete">EAN36</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="47"/>
-        <source>Choose Gas</source>
+        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <source>No location data - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="188"/>
-        <source>No location data - move the map and double-click to set the dive location</source>
+        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3838,17 +4165,17 @@ Please, remove them first.</source>
         <translation type="unfinished">Schließen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="26"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation type="unfinished">Ø</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="29"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation type="unfinished">Min.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation type="unfinished">Max.</translation>
     </message>
@@ -3867,92 +4194,95 @@ Please, remove them first.</source>
     </message>
 </context>
 <context>
-    <name>SubsurfaceAbout</name>
+    <name>ShiftTimesDialog</name>
     <message>
-        <location filename="../qt-ui/about.ui" line="23"/>
-        <source>About Subsurface</source>
-        <translation type="unfinished">Info zu Subsurface</translation>
+        <location filename="../qt-ui/shifttimes.ui" line="14"/>
+        <source>Shift selected times</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
+        <location filename="../qt-ui/shifttimes.ui" line="35"/>
+        <source>Shift times of selected dives by</source>
         <translation type="unfinished"></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>
+        <location filename="../qt-ui/shifttimes.ui" line="80"/>
+        <source>h:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="22"/>
-        <source>&amp;License</source>
+        <location filename="../qt-ui/shifttimes.ui" line="90"/>
+        <source>earlier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
-        <source>&amp;Website</source>
+        <location filename="../qt-ui/shifttimes.ui" line="97"/>
+        <source>later</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SubsurfaceWebServices</name>
+    <name>SubsurfaceAbout</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="14"/>
-        <source>Download Location Data</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/about.ui" line="23"/>
+        <source>About Subsurface</source>
+        <translation type="unfinished">Info zu Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="37"/>
-        <source>Download</source>
+        <location filename="../qt-ui/about.ui" line="64"/>
+        <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="44"/>
-        <source>Enter your ID here</source>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="51"/>
-        <source>User ID</source>
+        <location filename="../qt-ui/about.cpp" line="22"/>
+        <source>&amp;License</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="58"/>
-        <source>Status:</source>
+        <location filename="../qt-ui/about.cpp" line="23"/>
+        <source>&amp;Website</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="49"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
         <translation type="unfinished">Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="90"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="106"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="130"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
         <translation type="unfinished">Verbindungsfehler: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
         <translation type="unfinished">Ungültige Benutzerkennung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
         <translation type="unfinished">Verstehe die Antwort nicht!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="133"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
         <translation type="unfinished">Erfolgreich geladen!</translation>
     </message>
@@ -3973,17 +4303,17 @@ Please, remove them first.</source>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Bar</source>
         <translation type="unfinished">bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3991,7 +4321,7 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1393"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3999,96 +4329,139 @@ Please, remove them first.</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>WebServices</name>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="14"/>
+        <source>Download Location Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="20"/>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="27"/>
+        <source>Enter your ID here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="34"/>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="58"/>
+        <source>User ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="72"/>
+        <source>Password</source>
+        <translation type="unfinished">Passwort</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="86"/>
+        <source>Upload</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
         <translation type="unfinished">Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
         <translation type="unfinished">Gewicht</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="460"/>
+        <source>Clicking here will remove this weigthsystem.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
- &gt; Month</source>
+ &gt; Month / Trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
         <translation type="unfinished">Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1307"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1310"/>
+        <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1311"/>
+        <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1312"/>
-        <location filename="../qt-ui/models.cpp" line="1315"/>
-        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <location filename="../qt-ui/models.cpp" line="1418"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1313"/>
-        <location filename="../qt-ui/models.cpp" line="1316"/>
-        <location filename="../qt-ui/models.cpp" line="1319"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"></translation>
@@ -4097,91 +4470,74 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="44"/>
+        <location filename="../dive.c" line="57"/>
         <source>pascal</source>
         <translation type="unfinished">Pa</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="48"/>
-        <location filename="../qt-gui.cpp" line="323"/>
+        <location filename="../dive.c" line="61"/>
+        <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
         <translation type="unfinished">bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="52"/>
-        <location filename="../qt-gui.cpp" line="326"/>
+        <location filename="../dive.c" line="65"/>
+        <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
         <translation type="unfinished">psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="88"/>
-        <location filename="../qt-gui.cpp" line="304"/>
+        <location filename="../dive.c" line="101"/>
+        <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
         <translation type="unfinished">l</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="93"/>
-        <location filename="../qt-gui.cpp" line="307"/>
+        <location filename="../dive.c" line="106"/>
+        <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
         <translation type="unfinished">cu.ft.</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="121"/>
-        <location filename="../qt-gui.cpp" line="207"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
         <translation type="unfinished">m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="126"/>
-        <location filename="../qt-gui.cpp" line="210"/>
+        <location filename="../dive.c" line="139"/>
+        <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
         <translation type="unfinished">ft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="170"/>
-        <location filename="../qt-gui.cpp" line="233"/>
+        <location filename="../dive.c" line="183"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
         <translation type="unfinished">US Pfund</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
-        <location filename="../qt-gui.cpp" line="231"/>
+        <location filename="../dive.c" line="187"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="966"/>
+        <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
         <translation type="unfinished">(%s) oder (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="473"/>
         <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <translation type="unfinished">%1$s %3$d. %2$s %4$d %5$02d:%6$02d</translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="490"/>
-        <source>%1$s %2$d, %3$d
-%4$02d:%5$02d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="512"/>
-        <source>%1$s %2$d (%3$d dives)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="519"/>
-        <source>%1$s %2$d (1 dive)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">%1$s %3$d. %2$s %4$d %5$02d:%6$02d</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="550"/>
-        <location filename="../planner.c" line="94"/>
-        <location filename="../planner.c" line="748"/>
-        <location filename="../planner.c" line="749"/>
-        <location filename="../statistics.c" line="360"/>
-        <location filename="../statistics.c" line="371"/>
+        <location filename="../divelist.c" line="488"/>
+        <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"/>
         <source>air</source>
         <translation type="unfinished">Luft</translation>
     </message>
@@ -4211,312 +4567,324 @@ Maximum</source>
         <translation type="unfinished">clip-on</translation>
     </message>
     <message>
-        <location filename="../file.c" line="106"/>
-        <location filename="../file.c" line="108"/>
-        <location filename="../file.c" line="303"/>
-        <location filename="../file.c" line="305"/>
+        <location filename="../file.c" line="107"/>
+        <location filename="../file.c" line="109"/>
+        <location filename="../file.c" line="308"/>
+        <location filename="../file.c" line="310"/>
+        <location filename="../file.c" line="390"/>
+        <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation type="unfinished">Fehler beim Lesen von &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <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>
+    </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>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
         <translation type="unfinished">keine</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
         <translation type="unfinished">Deko-Stopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
         <translation type="unfinished">rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
         <translation type="unfinished">Aufstieg</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
         <translation type="unfinished">tiefster Deko-Stopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
         <translation type="unfinished">Arbeit</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
         <translation type="unfinished">Sender</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
         <translation type="unfinished">Verletzung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
         <translation type="unfinished">Markierung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
         <translation type="unfinished">Oberfläche</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
         <translation type="unfinished">Sicherheitsstopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
         <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
         <translation type="unfinished">Gaswechsel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
         <translation type="unfinished">Sicherheitsstopp (freiwillig)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
         <translation type="unfinished">Sicherheitsstopp (verpflichtend)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
         <translation type="unfinished">Tiefen-Stopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
         <translation type="unfinished">Sicherheits-Stopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
         <translation type="unfinished">Tauchgangsdauer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
         <translation type="unfinished">Max. Tiefe</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
         <translation type="unfinished">OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
         <translation type="unfinished">PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
         <translation type="unfinished">verbleibende Atemzeit</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
         <translation type="unfinished">rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
         <translation type="unfinished">Richtung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
         <translation type="unfinished">Gewebewarnung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
         <translation type="unfinished">Nullzeit</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="157"/>
+        <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
         <translation type="unfinished">ungültige Ereignisnummer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="390"/>
+        <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
         <translation type="unfinished">Nicht in der Lage, einen Parser für %s %s zu erstellen</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="396"/>
+        <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
         <translation type="unfinished">Fehler beim Registrieren der Daten</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="405"/>
+        <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
         <translation type="unfinished">Fehler beim Lesen des Datums</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
         <translation type="unfinished">Tauchgang Nr. %d: %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="427"/>
+        <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
         <translation type="unfinished">Fehler beim Lesen der Dauer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="437"/>
+        <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
         <translation type="unfinished">Fehler beim Lesen der maximalen Tiefe</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="447"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
         <translation type="unfinished">Fehler beim Lesen der Gasgemischszahl</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
         <translation type="unfinished">Fehler beim Lesen des Salzgehalts</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="469"/>
+        <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
         <translation type="unfinished">Fehler beim Lesen der Gasgemischs</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
         <translation type="unfinished">Fehler beim Lesen der Samples</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="613"/>
+        <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
         <translation type="unfinished">Ereignis: warte auf Benutzeraktion</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="621"/>
+        <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation type="unfinished">model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="663"/>
+        <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
         <translation type="unfinished">Fehler beim Registrieren der Ereignisbehandlung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="668"/>
+        <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished">Fehler bei der Registrierung der Abbruchbehandlung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="672"/>
+        <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
         <translation type="unfinished">Fehler beim Importieren der Tauchgangsdaten</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="690"/>
+        <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished">Fehler beim Erzeugen des libdivecomputer Contexts</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished">Fehler beim Öffnen von %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="549"/>
+        <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
         <translation type="unfinished">Unverständliche Prozentangabe %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1695"/>
+        <location filename="../parse-xml.c" line="1717"/>
         <source>Failed to parse &apos;%s&apos;.
 </source>
         <translation type="unfinished">Fehler beim Lesen von &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1696"/>
+        <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation type="unfinished">Fehler beim Lesen von &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1894"/>
+        <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
         <translation type="unfinished">Datenbank Anfrage &apos;get_events&apos; fehlgeschlagen.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1929"/>
+        <location filename="../parse-xml.c" line="1951"/>
         <source>Database connection failed &apos;%s&apos;.
 </source>
         <translation type="unfinished">Datenbank Verbindung fehlgeschlagen &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1936"/>
+        <location filename="../parse-xml.c" line="1958"/>
         <source>Database query failed &apos;%s&apos;.
 </source>
         <translation type="unfinished">Datenbank Anfrage fehlgeschlagen &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2048"/>
+        <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
         <translation type="unfinished">Fehler beim Öffnen des Styleshhets (%s)/%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="96"/>
-        <location filename="../statistics.c" line="363"/>
+        <location filename="../planner.c" line="98"/>
+        <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
         <translation type="unfinished">EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="131"/>
+        <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation type="unfinished">Kann Gasgemisch %d/%d nicht finden</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="192"/>
         <source>Cylinder for planning</source>
-        <translation type="unfinished">Flasche für Tauchplanung</translation>
+        <translation type="obsolete">Flasche für Tauchplanung</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="217"/>
         <source>Simulated Dive</source>
-        <translation type="unfinished">Simulierter Tauchgang</translation>
+        <translation type="obsolete">Simulierter Tauchgang</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="294"/>
+        <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
         <translation type="unfinished">Zu viele Gasgemische</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="472"/>
+        <location filename="../planner.c" line="493"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -4529,180 +4897,173 @@ basierend auf GFlow = %.0f und GFhigh = %.0f
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="513"/>
+        <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished">Tauchen auf %.*f %s in %d:%02d min - Gesamtzeit %d:%02u mit %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="522"/>
+        <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished">Verbleibe auf %.*f %s für %d:%02d min - Gesamtzeit %d:%02u mit %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
         <translation type="unfinished">Gaswechsel zu %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
         <translation type="unfinished">Gasverbrauch:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="552"/>
+        <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
         <translation type="unfinished">%.0f%s %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="776"/>
         <source>ean</source>
         <translation type="unfinished">ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1154"/>
         <source>D:%.1f %s</source>
-        <translation type="unfinished">T:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1158"/>
-        <source>%s
-T:%d:%02d</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">T:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
         <translation type="unfinished">%s
 D:%d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
         <translation type="unfinished">%s
 T:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1177"/>
+        <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation type="unfinished">%s
 Berechneter tiefster Deko-Stopp %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1189"/>
+        <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation type="unfinished">%s
 Sicherheitsstopp:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1199"/>
+        <source>@:%d:%02d
+D:%.1f %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1219"/>
+        <source>%s
+SAC:%2.1fl/min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation type="unfinished">%s
 Sicherheitsstopp:unbk Zeit @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation type="unfinished">%s
 Deko:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1211"/>
+        <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation type="unfinished">%s
 Deko:unbk Zeit @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1217"/>
+        <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
         <translation type="unfinished">%s
 In Deko</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
-        <source>%s
-NDL:-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1275"/>
         <source>%s
 NDL:%umin</source>
         <translation type="unfinished">%s
 NDL:%umin</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
-        <source>%s
-TTS:%umin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1223"/>
         <source>%s
 CNS:%u%%</source>
         <translation type="unfinished">%s
 CNS:%u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1227"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation type="unfinished">%s
 pO%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1231"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation type="unfinished">%s
 pN%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1243"/>
+        <location filename="../profile.c" line="1235"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation type="unfinished">%s
 pHe:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1240"/>
         <source>%s
 MOD:%d%s</source>
         <translation type="unfinished">%s
 MOD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1247"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -4713,295 +5074,346 @@ END:%d%s
 EADD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1349"/>
+        <location filename="../profile.c" line="1280"/>
+        <source>%s
+Deco:%umin @ %.0f %s (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1289"/>
+        <source>%s
+In deco (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>%s
+NDL:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1296"/>
+        <source>%s
+TTS:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
-        <location filename="../profile.c" line="1357"/>
+        <location filename="../profile.c" line="1409"/>
+        <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1361"/>
+        <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1365"/>
+        <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1369"/>
-        <source>%s%sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1425"/>
+        <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1373"/>
-        <location filename="../profile.c" line="1377"/>
-        <source>%s %sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1429"/>
+        <location filename="../profile.c" line="1433"/>
+        <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1384"/>
+        <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="284"/>
+        <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="288"/>
+        <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../qt-gui.cpp" line="460"/>
+        <source>%1, %2 %3, %4 %5:%6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="473"/>
+        <source>%1 %2, %3
+%4:%5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="486"/>
+        <source>%1 %2 (%3 dives)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="491"/>
+        <source>%1 %2 (1 dive)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>invalid</source>
-        <translation type="unfinished">ungültig</translation>
+        <translation type="obsolete">ungültig</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>boat</source>
         <translation type="unfinished">Boot</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>shore</source>
         <translation type="unfinished">Ufer</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>drift</source>
         <translation type="unfinished">Strömung</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>deep</source>
         <translation type="unfinished">tief</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>cavern</source>
         <translation type="unfinished">Kaverne</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="14"/>
         <source>ice</source>
         <translation type="unfinished">Eis</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>wreck</source>
         <translation type="unfinished">Wrack</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>cave</source>
         <translation type="unfinished">Höhle</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>altitude</source>
         <translation type="unfinished">Berg</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>pool</source>
         <translation type="unfinished">Pool</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>lake</source>
         <translation type="unfinished">See</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="16"/>
         <source>river</source>
         <translation type="unfinished">Fluss</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="17"/>
         <source>night</source>
         <translation type="unfinished">Nacht</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="17"/>
+        <source>fresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="17"/>
+        <source>student</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>freshwater</source>
-        <translation type="unfinished">Süsswasser</translation>
+        <translation type="obsolete">Süsswasser</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
         <source>training</source>
-        <translation type="unfinished">Übung</translation>
+        <translation type="obsolete">Übung</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
         <source>teaching</source>
-        <translation type="unfinished">Lehr</translation>
+        <translation type="obsolete">Lehr</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
         <source>photo</source>
         <translation type="unfinished">Foto</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
         <source>video</source>
         <translation type="unfinished">Video</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
+        <source>instructor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="19"/>
         <source>deco</source>
         <translation type="unfinished">deko</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="199"/>
+        <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
         <translation type="unfinished">mehr als %d Tage</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="205"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation type="unfinished">%dt %dst %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="207"/>
+        <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
         <translation type="unfinished">%dst %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="218"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation type="unfinished">für Tauchgänge Nr.</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="225"/>
+        <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
         <translation type="unfinished">für die ausgewählten Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="260"/>
+        <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
         <translation type="unfinished">für Tauchgang Nr. %d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="262"/>
+        <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
         <translation type="unfinished">für den ausgewählten Tauchgang</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="264"/>
+        <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
         <translation type="unfinished">für alle Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="266"/>
+        <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
         <translation type="unfinished">(keine Tauchgänge)</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="363"/>
-        <source>, EAN%d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
         <translation type="unfinished">So</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
         <translation type="unfinished">Mo</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
         <translation type="unfinished">Di</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
         <translation type="unfinished">Mi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
         <translation type="unfinished">Do</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
         <translation type="unfinished">Fr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
         <translation type="unfinished">Sa</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
         <translation type="unfinished">Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
         <translation type="unfinished">Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
         <translation type="unfinished">Mär</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
         <translation type="unfinished">Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
         <translation type="unfinished">Mai</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
         <translation type="unfinished">Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
         <translation type="unfinished">Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
         <translation type="unfinished">Aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
         <translation type="unfinished">Sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
         <translation type="unfinished">Okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
         <translation type="unfinished">Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
         <translation type="unfinished">Dez</translation>
     </message>
diff --git a/translations/subsurface_es_ES.ts b/translations/subsurface_es_ES.ts
index 5c0415e4c..b35cb38ab 100644
--- a/translations/subsurface_es_ES.ts
+++ b/translations/subsurface_es_ES.ts
@@ -2319,42 +2319,135 @@ and Salvador Cuñat</translation>
     </message>
 </context>
 <context>
+    <name>CSVImportDialog</name>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <source>Import File (CSV)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <source>Field Separator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <source>Field Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <source>Time</source>
+        <translation type="unfinished">Hora de entrada</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <source>Depth</source>
+        <translation type="unfinished">Profundidad</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <source>Temp</source>
+        <translation type="unfinished">Temp</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
+        <source>Po2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <source>Cns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <source>Stopdepth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <source>Pre-configured imports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>Open CSV Log File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>CSV Files (*.csv)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
         <translation type="unfinished">Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
         <translation type="unfinished">Tamaño</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="65"/>
+        <source>Switch at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="163"/>
+        <source>Clicking here will remove this cylinder.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="385"/>
+        <source>Cylinder cannot be removed</source>
+        <translation type="unfinished"></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>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
@@ -2378,30 +2471,35 @@ and Salvador Cuñat</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Device ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Model</source>
         <translation type="unfinished">Modelo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
         <translation type="unfinished">Nombre</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <source>Clicking here will remove this divecomputer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1009"/>
+        <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1011"/>
+        <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2409,186 +2507,206 @@ and Salvador Cuñat</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="39"/>
+        <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="398"/>
+        <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="399"/>
+        <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="400"/>
-        <source>collapse</source>
+        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <source>collapse others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="402"/>
-        <source>remove dive from trip</source>
+        <location filename="../qt-ui/divelistview.cpp" line="638"/>
+        <source>remove dive(s) from trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="405"/>
-        <source>Merge trip with trip above</source>
-        <translation type="unfinished">Combinar viaje con el viaje de encima</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="639"/>
+        <source>create new trip above</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="406"/>
-        <source>Merge trip with trip below</source>
-        <translation type="unfinished">Combinar viaje con el viaje de abajo</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="640"/>
+        <source>add dive(s) to trip immideately above</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="410"/>
-        <source>delete dive</source>
+        <location filename="../qt-ui/divelistview.cpp" line="643"/>
+        <source>merge trip with trip above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="412"/>
-        <source>merge selected dives</source>
+        <location filename="../qt-ui/divelistview.cpp" line="644"/>
+        <source>merge trip with trip below</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../qt-ui/divelistview.cpp" line="648"/>
+        <source>delete dive(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
-        <source>Bottom SAC</source>
+        <location filename="../qt-ui/divelistview.cpp" line="652"/>
+        <source>save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
-        <source>High GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="653"/>
+        <source>export As UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
-        <source>SAC on DECO Stop</source>
+        <location filename="../qt-ui/divelistview.cpp" line="654"/>
+        <source>shift times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
-        <source>Low GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
+        <source>Save Dives As...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="114"/>
-        <source>Last Stop at 6m</source>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
+        <source>Save File as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="141"/>
-        <source>Start Time</source>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="148"/>
-        <source>ATM Pressure</source>
+        <source>Merge trip with trip above</source>
+        <translation type="obsolete">Combinar viaje con el viaje de encima</translation>
+    </message>
+    <message>
+        <source>Merge trip with trip below</source>
+        <translation type="obsolete">Combinar viaje con el viaje de abajo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <source>merge selected dives</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DivePlannerGraphics</name>
+    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="143"/>
-        <source>10m</source>
+        <location filename="../qt-ui/diveplanner.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="145"/>
-        <source>30ft</source>
+        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <source>Bottom SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="146"/>
-        <source>Increase maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <source>SAC on DECO Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="147"/>
-        <source>Decreases maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <source>Increase minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>10min</source>
+        <location filename="../qt-ui/diveplanner.ui" line="108"/>
+        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>Decreases minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <source>Last Stop at 6m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
-        <source>Handler Position Error</source>
+        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="386"/>
-        <source>One or more of your stops will be lost with this operations, 
-Please, remove them first.</source>
+        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <source>ATM Pressure</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DivePlannerGraphics</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <source>10m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="136"/>
+        <source>30ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <source>Handler Position Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="415"/>
-        <source>Air</source>
+        <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>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="420"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="421"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="424"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="425"/>
-        <source>Air</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <source>AIR</source>
+        <translation type="unfinished">AIRE</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="986"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="987"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
         <translation type="unfinished">Duración</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="988"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="989"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1141"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1142"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2596,75 +2714,85 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="851"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="937"/>
+        <source>Available Gases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <source>add dive data point</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1051"/>
+        <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
         <translation type="unfinished">#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1052"/>
+        <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
         <translation type="unfinished">Fecha</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
         <translation type="unfinished">m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
         <translation type="unfinished">ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1055"/>
+        <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
         <translation type="unfinished">min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
         <translation type="unfinished">lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1058"/>
+        <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
         <translation type="unfinished">Traje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1059"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
         <translation type="unfinished">Bot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1061"/>
+        <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
         <translation type="unfinished">SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1062"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1063"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
         <translation type="unfinished">maxCNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1064"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
         <translation type="unfinished">Ubicación</translation>
     </message>
@@ -2672,14 +2800,20 @@ Please, remove them first.</source>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="138"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
         <translation type="unfinished">Error</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="142"/>
-        <source>retry</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
+        <source>Retry</source>
+        <translation type="unfinished">Intentar de nuevo</translation>
     </message>
 </context>
 <context>
@@ -2739,6 +2873,7 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
         <translation type="unfinished">Notas de la inmersión</translation>
     </message>
@@ -2753,225 +2888,238 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <source>M/d/yy h:mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="108"/>
-        <location filename="../qt-ui/maintab.cpp" line="307"/>
+        <location filename="../qt-ui/maintab.ui" line="112"/>
+        <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
         <translation type="unfinished">Ubicación</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="122"/>
+        <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="136"/>
+        <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
         <translation type="unfinished">Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="143"/>
+        <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
         <translation type="unfinished">Compañero</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="166"/>
+        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
         <translation type="unfinished">Valoración</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="173"/>
+        <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
         <translation type="unfinished">Visibilidad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="182"/>
+        <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
         <translation type="unfinished">Traje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="206"/>
-        <location filename="../qt-ui/maintab.cpp" line="308"/>
+        <location filename="../qt-ui/maintab.ui" line="217"/>
+        <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
         <translation type="unfinished">Notas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="232"/>
+        <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
         <translation type="unfinished">Equipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="319"/>
+        <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
         <translation type="unfinished">Información de la inmersión</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="361"/>
+        <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
         <translation type="unfinished">Fecha</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="380"/>
+        <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="399"/>
+        <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="418"/>
+        <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="437"/>
-        <location filename="../qt-ui/maintab.ui" line="692"/>
+        <location filename="../qt-ui/maintab.ui" line="466"/>
+        <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
         <translation type="unfinished">SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="456"/>
+        <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="475"/>
+        <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="494"/>
+        <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="513"/>
+        <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="532"/>
+        <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="551"/>
+        <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="570"/>
+        <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
         <translation type="unfinished">Duración de la inmersión</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="589"/>
+        <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
         <translation type="unfinished">Estadísticas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="668"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation type="unfinished">Profundidad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="680"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation type="unfinished">Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="704"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation type="unfinished">Duración</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="716"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation type="unfinished">Tiempo total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="735"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation type="unfinished">Inmersiones</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="68"/>
+        <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
         <translation type="unfinished">Botellas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="129"/>
-        <location filename="../qt-ui/maintab.cpp" line="131"/>
-        <source>This trip is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <source>Trip Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="137"/>
-        <location filename="../qt-ui/maintab.cpp" line="139"/>
-        <source>This dive is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="296"/>
+        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <source>Trip Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="286"/>
-        <source>Trip Location</source>
+        <location filename="../qt-ui/maintab.cpp" line="134"/>
+        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="288"/>
-        <source>Trip Notes</source>
+        <location filename="../qt-ui/maintab.cpp" line="143"/>
+        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
-        <location filename="../qt-ui/maintab.cpp" line="337"/>
-        <location filename="../qt-ui/maintab.cpp" line="338"/>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="146"/>
+        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <source>This dive is being edited. Select Save or Cancel when done.</source>
+        <translation type="unfinished"></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"/>
         <source>/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <source>unknown</source>
+        <translation type="unfinished">desconocido</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
         <translation type="unfinished">N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
         <translation type="unfinished">S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
         <translation type="unfinished">E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
         <translation type="unfinished">O</translation>
     </message>
@@ -2984,308 +3132,432 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="177"/>
         <source>File</source>
-        <translation type="unfinished">Archivo</translation>
+        <translation type="obsolete">Archivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="196"/>
         <source>Log</source>
-        <translation type="unfinished">Registro</translation>
+        <translation type="obsolete">Registro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="211"/>
         <source>View</source>
-        <translation type="unfinished">Ver</translation>
+        <translation type="obsolete">Ver</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="226"/>
+        <location filename="../qt-ui/mainwindow.ui" line="218"/>
         <source>Filter</source>
         <translation type="unfinished">Filtros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="232"/>
         <source>Help</source>
-        <translation type="unfinished">Ayuda</translation>
+        <translation type="obsolete">Ayuda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="245"/>
+        <location filename="../qt-ui/mainwindow.ui" line="177"/>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <source>&amp;Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <source>&amp;View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <source>&amp;Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>&amp;New logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
         <translation type="unfinished">Nuevo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <source>&amp;Open logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="256"/>
+        <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
+        <location filename="../qt-ui/mainwindow.ui" line="281"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation type="unfinished">Guardar como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
+        <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="277"/>
+        <location filename="../qt-ui/mainwindow.ui" line="292"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation type="unfinished">Cerrar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="285"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="176"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <source>Export UDDF</source>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <source>Export &amp;UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
-        <source>Print</source>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <source>Ctrl+U</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="301"/>
-        <source>Ctrl+P</source>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <source>&amp;Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
-        <source>Preferences</source>
-        <translation type="unfinished">Preferencias</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <source>Ctrl+,</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="311"/>
-        <source>Quit</source>
-        <translation type="unfinished">Salir</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
-        <source>Ctrl+Q</source>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <source>Import from &amp;dive computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <source>Download from Dive computer</source>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
-        <source>Ctrl+D</source>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <source>Ctrl+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="327"/>
-        <source>Download from Web Service</source>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <source>&amp;Edit Device Names</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="332"/>
-        <source>Edit Device Names</source>
-        <translation type="unfinished">Editar nombres del dispositivo</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <source>Ctrl++</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="337"/>
-        <source>Add Dive</source>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <source>&amp;Renumber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
-        <source>Renumber</source>
-        <translation type="unfinished">Renumerar</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Ctrl+R</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
-        <source>Auto Group</source>
+        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <source>Toggle &amp;Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
-        <source>Toggle Zoom</source>
-        <translation type="unfinished">Activar/desactivar ampliación</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <source>&amp;Yearly Statistics</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
-        <source>Yearly Statistics</source>
-        <translation type="unfinished">Estadísticas anuales</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <source>Ctrl+Y</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
-        <source>View List</source>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Dive List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="365"/>
-        <source>Ctrl+2</source>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <source>Profile</source>
+        <translation type="unfinished">Perfil</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <source>Info</source>
+        <translation type="unfinished">Info</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
-        <source>View Profile</source>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <source>User &amp;Manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="373"/>
-        <source>Ctrl+3</source>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <source>Globe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
-        <source>View Info</source>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <source>P&amp;lan Dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="381"/>
-        <source>Ctrl+4</source>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <source>Ctrl+L</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <source>Import CSV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <source>Import CS&amp;V</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <source>Import from Divelogs.de</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <source>Preferences</source>
+        <translation type="unfinished">Preferencias</translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="obsolete">Salir</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <source>Ctrl+D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Device Names</source>
+        <translation type="obsolete">Editar nombres del dispositivo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <source>Add Dive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Renumber</source>
+        <translation type="obsolete">Renumerar</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/mainwindow.ui" line="386"/>
-        <source>View All</source>
+        <source>Auto Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="389"/>
+        <source>Toggle Zoom</source>
+        <translation type="obsolete">Activar/desactivar ampliación</translation>
+    </message>
+    <message>
+        <source>Yearly Statistics</source>
+        <translation type="obsolete">Estadísticas anuales</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <source>Ctrl+2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <source>Ctrl+3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <source>Ctrl+4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>Ctrl+1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Prev DC</source>
         <translation type="unfinished">Anterior DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
+        <location filename="../qt-ui/mainwindow.ui" line="439"/>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="402"/>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Next DC</source>
         <translation type="unfinished">Siguiente DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="405"/>
+        <location filename="../qt-ui/mainwindow.ui" line="447"/>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="410"/>
+        <location filename="../qt-ui/mainwindow.ui" line="452"/>
         <source>Select Events</source>
         <translation type="unfinished">Seleccionar eventos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
         <source>Input Plan</source>
         <translation type="unfinished">Introducir Plan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
         <source>About Subsurface</source>
         <translation type="unfinished">Acerca de Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>User Manual</source>
-        <translation type="unfinished">Manual de usuario</translation>
+        <translation type="obsolete">Manual de usuario</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>F1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="433"/>
-        <source>View Globe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="478"/>
         <source>Ctrl+5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="441"/>
-        <source>Dive Planner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="108"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Open File</source>
         <translation type="unfinished">Abrir archivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="271"/>
-        <source>manually added dive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="448"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="450"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="455"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
         <translation type="unfinished">¿Guardar los cambios?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="456"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="695"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="696"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="144"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="250"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="286"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="197"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3348,215 +3620,235 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="218"/>
+        <location filename="../qt-ui/preferences.ui" line="199"/>
+        <source>Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="205"/>
+        <source>Use Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="225"/>
+        <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="235"/>
+        <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="245"/>
+        <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="269"/>
+        <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
         <translation type="unfinished">Profundidad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="276"/>
+        <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
         <translation type="unfinished">Metro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="286"/>
+        <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
         <translation type="unfinished">Pies</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
         <translation type="unfinished">Presión</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="303"/>
+        <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
         <translation type="unfinished">Bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="313"/>
+        <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="330"/>
+        <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
         <translation type="unfinished">Litro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="340"/>
+        <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
         <translation type="unfinished">pie³</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="350"/>
+        <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
         <translation type="unfinished">Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="357"/>
+        <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
         <translation type="unfinished">Celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
         <translation type="unfinished">Fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="377"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
         <translation type="unfinished">Peso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
         <translation type="unfinished">lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="464"/>
+        <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="472"/>
+        <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="495"/>
-        <location filename="../qt-ui/preferences.ui" line="536"/>
-        <location filename="../qt-ui/preferences.ui" line="577"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="513"/>
+        <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="554"/>
+        <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="595"/>
+        <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="618"/>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="634"/>
+        <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="643"/>
+        <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="666"/>
+        <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="677"/>
+        <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="700"/>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="710"/>
+        <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="721"/>
-        <source>Show time</source>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
+        <source>Calculate NDL/TTS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="733"/>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>Show SAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
+        <source>GFLow at max depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="739"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
-        <source>XML Files (*.xml)</source>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3694,51 +3986,86 @@ Please, remove them first.</source>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="257"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="259"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <source>Hide events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <source>Hide all %1 events?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <source>Remove the selected event?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <source>%1 @ %2:%3</source>
+        <translation type="unfinished"></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>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="337"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="383"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="384"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="582"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="850"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <source>Measure properties of dive segments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
+        <source>Scale your dive to screen size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
         <translation type="unfinished">aire</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="584"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="851"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="859"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
         <translation type="unfinished">Cambio de emergencia a OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="861"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished">comienzo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="862"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished">fin</translation>
@@ -3747,62 +4074,62 @@ Please, remove them first.</source>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1497"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
         <translation type="unfinished">desconocido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1502"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1505"/>
+        <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1512"/>
+        <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1517"/>
+        <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
         <translation type="unfinished">Botella</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1519"/>
+        <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
         <translation type="unfinished">Mezcla de gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
         <translation type="unfinished">Gas usado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1547"/>
+        <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
         <translation type="unfinished">SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1549"/>
+        <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
         <translation type="unfinished">Max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1551"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1564"/>
+        <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1570"/>
+        <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3811,30 +4138,30 @@ Please, remove them first.</source>
     <name>QObject</name>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="44"/>
         <source>AIR</source>
         <translation type="unfinished">AIRE</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="38"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="45"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="723"/>
+        <source>Remove this Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>EAN32</source>
-        <translation type="unfinished">EAN32</translation>
+        <translation type="obsolete">EAN32</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="46"/>
         <source>EAN36</source>
-        <translation type="unfinished">EAN36</translation>
+        <translation type="obsolete">EAN36</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="47"/>
-        <source>Choose Gas</source>
+        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <source>No location data - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="188"/>
-        <source>No location data - move the map and double-click to set the dive location</source>
+        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3843,17 +4170,17 @@ Please, remove them first.</source>
         <translation type="unfinished">Cerrar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="26"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation type="unfinished">Promedio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="29"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3872,92 +4199,95 @@ Please, remove them first.</source>
     </message>
 </context>
 <context>
-    <name>SubsurfaceAbout</name>
+    <name>ShiftTimesDialog</name>
     <message>
-        <location filename="../qt-ui/about.ui" line="23"/>
-        <source>About Subsurface</source>
-        <translation type="unfinished">Acerca de Subsurface</translation>
+        <location filename="../qt-ui/shifttimes.ui" line="14"/>
+        <source>Shift selected times</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
+        <location filename="../qt-ui/shifttimes.ui" line="35"/>
+        <source>Shift times of selected dives by</source>
         <translation type="unfinished"></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>
+        <location filename="../qt-ui/shifttimes.ui" line="80"/>
+        <source>h:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="22"/>
-        <source>&amp;License</source>
+        <location filename="../qt-ui/shifttimes.ui" line="90"/>
+        <source>earlier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
-        <source>&amp;Website</source>
+        <location filename="../qt-ui/shifttimes.ui" line="97"/>
+        <source>later</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SubsurfaceWebServices</name>
+    <name>SubsurfaceAbout</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="14"/>
-        <source>Download Location Data</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/about.ui" line="23"/>
+        <source>About Subsurface</source>
+        <translation type="unfinished">Acerca de Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="37"/>
-        <source>Download</source>
+        <location filename="../qt-ui/about.ui" line="64"/>
+        <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="44"/>
-        <source>Enter your ID here</source>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="51"/>
-        <source>User ID</source>
+        <location filename="../qt-ui/about.cpp" line="22"/>
+        <source>&amp;License</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="58"/>
-        <source>Status:</source>
+        <location filename="../qt-ui/about.cpp" line="23"/>
+        <source>&amp;Website</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="49"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
         <translation type="unfinished">Servicio web</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="90"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="106"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="130"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
         <translation type="unfinished">Error de conexión:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
         <translation type="unfinished">El identificador de usuario no es válido.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
         <translation type="unfinished">No se puede analizar la respuesta.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="133"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
         <translation type="unfinished">Se ha completado la descarga correctamente.</translation>
     </message>
@@ -3978,17 +4308,17 @@ Please, remove them first.</source>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Bar</source>
         <translation type="unfinished">Bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3996,7 +4326,7 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1393"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4004,96 +4334,139 @@ Please, remove them first.</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>WebServices</name>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="14"/>
+        <source>Download Location Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="20"/>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="27"/>
+        <source>Enter your ID here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="34"/>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="58"/>
+        <source>User ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="72"/>
+        <source>Password</source>
+        <translation type="unfinished">Contraseña</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="86"/>
+        <source>Upload</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
         <translation type="unfinished">Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
         <translation type="unfinished">Peso</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="460"/>
+        <source>Clicking here will remove this weigthsystem.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
- &gt; Month</source>
+ &gt; Month / Trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
         <translation type="unfinished">#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1307"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1310"/>
+        <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1311"/>
+        <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1312"/>
-        <location filename="../qt-ui/models.cpp" line="1315"/>
-        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <location filename="../qt-ui/models.cpp" line="1418"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1313"/>
-        <location filename="../qt-ui/models.cpp" line="1316"/>
-        <location filename="../qt-ui/models.cpp" line="1319"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"></translation>
@@ -4102,91 +4475,74 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="44"/>
+        <location filename="../dive.c" line="57"/>
         <source>pascal</source>
         <translation type="unfinished">pascal</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="48"/>
-        <location filename="../qt-gui.cpp" line="323"/>
+        <location filename="../dive.c" line="61"/>
+        <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
         <translation type="unfinished">bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="52"/>
-        <location filename="../qt-gui.cpp" line="326"/>
+        <location filename="../dive.c" line="65"/>
+        <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
         <translation type="unfinished">psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="88"/>
-        <location filename="../qt-gui.cpp" line="304"/>
+        <location filename="../dive.c" line="101"/>
+        <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
         <translation type="unfinished">l</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="93"/>
-        <location filename="../qt-gui.cpp" line="307"/>
+        <location filename="../dive.c" line="106"/>
+        <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
         <translation type="unfinished">pie³</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="121"/>
-        <location filename="../qt-gui.cpp" line="207"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
         <translation type="unfinished">m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="126"/>
-        <location filename="../qt-gui.cpp" line="210"/>
+        <location filename="../dive.c" line="139"/>
+        <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
         <translation type="unfinished">ft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="170"/>
-        <location filename="../qt-gui.cpp" line="233"/>
+        <location filename="../dive.c" line="183"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
         <translation type="unfinished">lbs</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
-        <location filename="../qt-gui.cpp" line="231"/>
+        <location filename="../dive.c" line="187"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="966"/>
+        <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
         <translation type="unfinished">(%s) o (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="473"/>
         <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <translation type="unfinished">%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="490"/>
-        <source>%1$s %2$d, %3$d
-%4$02d:%5$02d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="512"/>
-        <source>%1$s %2$d (%3$d dives)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="519"/>
-        <source>%1$s %2$d (1 dive)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="550"/>
-        <location filename="../planner.c" line="94"/>
-        <location filename="../planner.c" line="748"/>
-        <location filename="../planner.c" line="749"/>
-        <location filename="../statistics.c" line="360"/>
-        <location filename="../statistics.c" line="371"/>
+        <location filename="../divelist.c" line="488"/>
+        <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"/>
         <source>air</source>
         <translation type="unfinished">aire</translation>
     </message>
@@ -4216,312 +4572,324 @@ Maximum</source>
         <translation type="unfinished">clip-on</translation>
     </message>
     <message>
-        <location filename="../file.c" line="106"/>
-        <location filename="../file.c" line="108"/>
-        <location filename="../file.c" line="303"/>
-        <location filename="../file.c" line="305"/>
+        <location filename="../file.c" line="107"/>
+        <location filename="../file.c" line="109"/>
+        <location filename="../file.c" line="308"/>
+        <location filename="../file.c" line="310"/>
+        <location filename="../file.c" line="390"/>
+        <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation type="unfinished">No se pudo leer «%s»</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <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>
+    </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>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
         <translation type="unfinished">ninguno</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
         <translation type="unfinished">parada deco</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
         <translation type="unfinished">rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
         <translation type="unfinished">ascenso</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
         <translation type="unfinished">techo</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
         <translation type="unfinished">carga</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
         <translation type="unfinished">transmisor</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
         <translation type="unfinished">violación</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
         <translation type="unfinished">marcador</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
         <translation type="unfinished">superficie</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
         <translation type="unfinished">parada de seguridad</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
         <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
         <translation type="unfinished">cambio de mezcla</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
         <translation type="unfinished">parada de seguridad (voluntaria)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
         <translation type="unfinished">parada de seguridad (obligatoria)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
         <translation type="unfinished">parada de profundidad</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
         <translation type="unfinished">techo (parada de seguridad)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
         <translation type="unfinished">duración de inmersión</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
         <translation type="unfinished">Profundidad Max</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
         <translation type="unfinished">OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
         <translation type="unfinished">PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
         <translation type="unfinished">tiempo de aire</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
         <translation type="unfinished">rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
         <translation type="unfinished">encabezado</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
         <translation type="unfinished">Alarma de nivel de tejidos</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
         <translation type="unfinished">tiempo sin parada</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="157"/>
+        <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
         <translation type="unfinished">el número de evento no es válido</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="390"/>
+        <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
         <translation type="unfinished">No es posible crear el analizador para %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="396"/>
+        <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
         <translation type="unfinished">Error al registrar los datos</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="405"/>
+        <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
         <translation type="unfinished">Error al analizar la fecha</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
         <translation type="unfinished">Inmersión n.º %d: %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="427"/>
+        <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
         <translation type="unfinished">Error al analizar el tiempo de buceo</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="437"/>
+        <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
         <translation type="unfinished">Error al analizar la máxima profundidad</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="447"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
         <translation type="unfinished">Error al analizar el conteo de mezcla de gas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
         <translation type="unfinished">Error al obtener salinidad del agua</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="469"/>
+        <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
         <translation type="unfinished">Error al analizar la mezcla de gas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
         <translation type="unfinished">Error al analizar las muestras</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="613"/>
+        <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
         <translation type="unfinished">Evento: esperando acción del usuario</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="621"/>
+        <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation type="unfinished">modelo=%u (0x%08x), firmware=%u (0x%08x), n.º de serie=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="663"/>
+        <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
         <translation type="unfinished">Error al registrar el manejador de eventos</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="668"/>
+        <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished">Error al registrar el manejador de cancelación</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="672"/>
+        <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
         <translation type="unfinished">Error al importar datos de inmersiones</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="690"/>
+        <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished">No es posible crear el contexto de libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished">No se pudo abrir  %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="549"/>
+        <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
         <translation type="unfinished">Porcentaje extraño al leer %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1695"/>
+        <location filename="../parse-xml.c" line="1717"/>
         <source>Failed to parse &apos;%s&apos;.
 </source>
         <translation type="unfinished">No se pudo analizar «%s».
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1696"/>
+        <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation type="unfinished">No se pudo analizar «%s»</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1894"/>
+        <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
         <translation type="unfinished">Falló la petición get_events a la base de datos.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1929"/>
+        <location filename="../parse-xml.c" line="1951"/>
         <source>Database connection failed &apos;%s&apos;.
 </source>
         <translation type="unfinished">Falló la conexión a la base de datos &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1936"/>
+        <location filename="../parse-xml.c" line="1958"/>
         <source>Database query failed &apos;%s&apos;.
 </source>
         <translation type="unfinished">Falló la petición a la base de datos &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2048"/>
+        <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
         <translation type="unfinished">No se puede abrir la hoja de estilos (%s)/%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="96"/>
-        <location filename="../statistics.c" line="363"/>
+        <location filename="../planner.c" line="98"/>
+        <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
         <translation type="unfinished">EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="131"/>
+        <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation type="unfinished">No encuentro el gas %d/%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="192"/>
         <source>Cylinder for planning</source>
-        <translation type="unfinished">Botella para planificar</translation>
+        <translation type="obsolete">Botella para planificar</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="217"/>
         <source>Simulated Dive</source>
-        <translation type="unfinished">Inmersión simulada</translation>
+        <translation type="obsolete">Inmersión simulada</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="294"/>
+        <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
         <translation type="unfinished">Demasiadas mezclas de gas</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="472"/>
+        <location filename="../planner.c" line="493"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -4534,180 +4902,173 @@ basado en GFbajo = %.0f  y  GFalto = %.0f
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="513"/>
+        <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished">Cambio de cota a %.*f %s en %d:%02d min - runtime %d:%02u con %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="522"/>
+        <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished">Permanecer a  %.*f %s durante %d:%02d min - runtime %d:%02u en %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
         <translation type="unfinished">Cambio de gas a %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
         <translation type="unfinished">Consumo de gas:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="552"/>
+        <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
         <translation type="unfinished">%.0f%s de %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="776"/>
         <source>ean</source>
         <translation type="unfinished">ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1154"/>
         <source>D:%.1f %s</source>
-        <translation type="unfinished">D:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1158"/>
-        <source>%s
-T:%d:%02d</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">D:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
         <translation type="unfinished">%s
 P:%d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
         <translation type="unfinished">%s
 T:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1177"/>
+        <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation type="unfinished">%s
 Techo calculado %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1189"/>
+        <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation type="unfinished">%s
 Parada de seguridad:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1199"/>
+        <source>@:%d:%02d
+D:%.1f %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1219"/>
+        <source>%s
+SAC:%2.1fl/min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation type="unfinished">%s
 Parada de seguridad:tiempo desconocido @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation type="unfinished">%s
 Deco:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1211"/>
+        <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation type="unfinished">%s
 Deco:Tiempo desconocido @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1217"/>
+        <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
         <translation type="unfinished">%s
 En deco</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
-        <source>%s
-NDL:-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1275"/>
         <source>%s
 NDL:%umin</source>
         <translation type="unfinished">%s
 NDL:%umin</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
-        <source>%s
-TTS:%umin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1223"/>
         <source>%s
 CNS:%u%%</source>
         <translation type="unfinished">%s
 CNS:%u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1227"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation type="unfinished">%s
 pO%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1231"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation type="unfinished">%s
 pN%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1243"/>
+        <location filename="../profile.c" line="1235"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation type="unfinished">%s
 pHe:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1240"/>
         <source>%s
 MOD:%d%s</source>
         <translation type="unfinished">%s
 MOD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1247"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -4718,295 +5079,346 @@ PNE:%d%s
 EADD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1349"/>
+        <location filename="../profile.c" line="1280"/>
+        <source>%s
+Deco:%umin @ %.0f %s (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1289"/>
+        <source>%s
+In deco (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>%s
+NDL:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1296"/>
+        <source>%s
+TTS:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
-        <location filename="../profile.c" line="1357"/>
+        <location filename="../profile.c" line="1409"/>
+        <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1361"/>
+        <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1365"/>
+        <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1369"/>
-        <source>%s%sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1425"/>
+        <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1373"/>
-        <location filename="../profile.c" line="1377"/>
-        <source>%s %sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1429"/>
+        <location filename="../profile.c" line="1433"/>
+        <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1384"/>
+        <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="284"/>
+        <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="288"/>
+        <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../qt-gui.cpp" line="460"/>
+        <source>%1, %2 %3, %4 %5:%6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="473"/>
+        <source>%1 %2, %3
+%4:%5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="486"/>
+        <source>%1 %2 (%3 dives)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="491"/>
+        <source>%1 %2 (1 dive)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>invalid</source>
-        <translation type="unfinished">no válida</translation>
+        <translation type="obsolete">no válida</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>boat</source>
         <translation type="unfinished">barco</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>shore</source>
         <translation type="unfinished">orilla</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>drift</source>
         <translation type="unfinished">a la deriva</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>deep</source>
         <translation type="unfinished">profunda</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>cavern</source>
         <translation type="unfinished">caverna</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="14"/>
         <source>ice</source>
         <translation type="unfinished">hielo</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>wreck</source>
         <translation type="unfinished">pecio</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>cave</source>
         <translation type="unfinished">cueva</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>altitude</source>
         <translation type="unfinished">altura</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>pool</source>
         <translation type="unfinished">piscina</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>lake</source>
         <translation type="unfinished">lago</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="16"/>
         <source>river</source>
         <translation type="unfinished">río</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="17"/>
         <source>night</source>
         <translation type="unfinished">noche</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="17"/>
+        <source>fresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="17"/>
+        <source>student</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>freshwater</source>
-        <translation type="unfinished">agua dulce</translation>
+        <translation type="obsolete">agua dulce</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
         <source>training</source>
-        <translation type="unfinished">entrenamiento</translation>
+        <translation type="obsolete">entrenamiento</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
         <source>teaching</source>
-        <translation type="unfinished">enseñanza</translation>
+        <translation type="obsolete">enseñanza</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
         <source>photo</source>
         <translation type="unfinished">foto</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
         <source>video</source>
         <translation type="unfinished">vídeo</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
+        <source>instructor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="19"/>
         <source>deco</source>
         <translation type="unfinished">deco</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="199"/>
+        <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
         <translation type="unfinished">más de %d días</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="205"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation type="unfinished">%dd, %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="207"/>
+        <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
         <translation type="unfinished">%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="218"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation type="unfinished">para las inmersiones n.º</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="225"/>
+        <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
         <translation type="unfinished">para las inmersiones seleccionadas</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="260"/>
+        <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
         <translation type="unfinished">para la inmersión n.º %d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="262"/>
+        <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
         <translation type="unfinished">para la inmersión seleccionada</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="264"/>
+        <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
         <translation type="unfinished">Todas las inmersiones</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="266"/>
+        <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
         <translation type="unfinished">(ninguna inmersión)</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="363"/>
-        <source>, EAN%d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
         <translation type="unfinished">Do</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
         <translation type="unfinished">Lu</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
         <translation type="unfinished">Ma</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
         <translation type="unfinished">Mi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
         <translation type="unfinished">Ju</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
         <translation type="unfinished">Vi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
         <translation type="unfinished">Sa</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
         <translation type="unfinished">Ene</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
         <translation type="unfinished">Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
         <translation type="unfinished">Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
         <translation type="unfinished">Abr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
         <translation type="unfinished">Mayo</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
         <translation type="unfinished">Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
         <translation type="unfinished">Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
         <translation type="unfinished">Ago</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
         <translation type="unfinished">Sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
         <translation type="unfinished">Oct</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
         <translation type="unfinished">Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
         <translation type="unfinished">Dic</translation>
     </message>
diff --git a/translations/subsurface_et_EE.ts b/translations/subsurface_et_EE.ts
index 5b9ad9eaa..36bdb3f63 100644
--- a/translations/subsurface_et_EE.ts
+++ b/translations/subsurface_et_EE.ts
@@ -236,42 +236,135 @@ pO%s:%.2fbar</source>
     </message>
 </context>
 <context>
+    <name>CSVImportDialog</name>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <source>Import File (CSV)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <source>Field Separator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <source>Field Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <source>Depth</source>
+        <translation type="unfinished">Sügavus</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <source>Temp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
+        <source>Po2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <source>Cns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <source>Stopdepth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <source>Pre-configured imports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>Open CSV Log File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>CSV Files (*.csv)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="65"/>
+        <source>Switch at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="163"/>
+        <source>Clicking here will remove this cylinder.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="385"/>
+        <source>Cylinder cannot be removed</source>
+        <translation type="unfinished"></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>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
@@ -295,30 +388,35 @@ pO%s:%.2fbar</source>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Device ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Model</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <source>Clicking here will remove this divecomputer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1009"/>
+        <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1011"/>
+        <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
         <translation type="unfinished"></translation>
     </message>
@@ -326,186 +424,198 @@ pO%s:%.2fbar</source>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="39"/>
+        <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="398"/>
+        <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="399"/>
+        <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="400"/>
-        <source>collapse</source>
+        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <source>collapse others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="402"/>
-        <source>remove dive from trip</source>
+        <location filename="../qt-ui/divelistview.cpp" line="638"/>
+        <source>remove dive(s) from trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="405"/>
-        <source>Merge trip with trip above</source>
+        <location filename="../qt-ui/divelistview.cpp" line="639"/>
+        <source>create new trip above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="406"/>
-        <source>Merge trip with trip below</source>
+        <location filename="../qt-ui/divelistview.cpp" line="640"/>
+        <source>add dive(s) to trip immideately above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="410"/>
-        <source>delete dive</source>
+        <location filename="../qt-ui/divelistview.cpp" line="643"/>
+        <source>merge trip with trip above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="412"/>
-        <source>merge selected dives</source>
+        <location filename="../qt-ui/divelistview.cpp" line="644"/>
+        <source>merge trip with trip below</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../qt-ui/divelistview.cpp" line="648"/>
+        <source>delete dive(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
-        <source>Bottom SAC</source>
+        <location filename="../qt-ui/divelistview.cpp" line="652"/>
+        <source>save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
-        <source>High GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="653"/>
+        <source>export As UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
-        <source>SAC on DECO Stop</source>
+        <location filename="../qt-ui/divelistview.cpp" line="654"/>
+        <source>shift times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
-        <source>Low GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
+        <source>Save Dives As...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="114"/>
-        <source>Last Stop at 6m</source>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
+        <source>Save File as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="141"/>
-        <source>Start Time</source>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="148"/>
-        <source>ATM Pressure</source>
+        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <source>merge selected dives</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DivePlannerGraphics</name>
+    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="143"/>
-        <source>10m</source>
+        <location filename="../qt-ui/diveplanner.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="145"/>
-        <source>30ft</source>
+        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <source>Bottom SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="146"/>
-        <source>Increase maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <source>SAC on DECO Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="147"/>
-        <source>Decreases maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <source>Increase minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>10min</source>
+        <location filename="../qt-ui/diveplanner.ui" line="108"/>
+        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>Decreases minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <source>Last Stop at 6m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
-        <source>Handler Position Error</source>
+        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="386"/>
-        <source>One or more of your stops will be lost with this operations, 
-Please, remove them first.</source>
+        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <source>ATM Pressure</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DivePlannerGraphics</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <source>10m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="136"/>
+        <source>30ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <source>Handler Position Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="415"/>
-        <source>Air</source>
+        <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>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="420"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="421"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="424"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="425"/>
-        <source>Air</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <source>AIR</source>
+        <translation type="unfinished">ÕHK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="986"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="987"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
         <translation type="unfinished">Kestus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="988"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="989"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1141"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1142"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -513,75 +623,85 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="851"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="937"/>
+        <source>Available Gases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <source>add dive data point</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1051"/>
+        <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1052"/>
+        <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
         <translation type="unfinished">Kuupäev</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1055"/>
+        <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1058"/>
+        <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1059"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1061"/>
+        <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1062"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1063"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1064"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
@@ -589,13 +709,19 @@ Please, remove them first.</source>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="138"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="142"/>
-        <source>retry</source>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
+        <source>Retry</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -656,6 +782,7 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -670,225 +797,238 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <source>M/d/yy h:mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="108"/>
-        <location filename="../qt-ui/maintab.cpp" line="307"/>
+        <location filename="../qt-ui/maintab.ui" line="112"/>
+        <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="122"/>
+        <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="136"/>
+        <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="143"/>
+        <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
         <translation type="unfinished">Semu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="166"/>
+        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="173"/>
+        <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="182"/>
+        <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="206"/>
-        <location filename="../qt-ui/maintab.cpp" line="308"/>
+        <location filename="../qt-ui/maintab.ui" line="217"/>
+        <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="232"/>
+        <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
         <translation type="unfinished">Varustus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="319"/>
+        <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="361"/>
+        <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
         <translation type="unfinished">Kuupäev</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="380"/>
+        <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="399"/>
+        <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="418"/>
+        <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="437"/>
-        <location filename="../qt-ui/maintab.ui" line="692"/>
+        <location filename="../qt-ui/maintab.ui" line="466"/>
+        <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="456"/>
+        <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="475"/>
+        <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="494"/>
+        <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="513"/>
+        <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="532"/>
+        <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="551"/>
+        <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="570"/>
+        <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="589"/>
+        <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="668"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation type="unfinished">Sügavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="680"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="704"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation type="unfinished">Kestus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="716"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="735"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="68"/>
+        <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
         <translation type="unfinished">Balloonid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="129"/>
-        <location filename="../qt-ui/maintab.cpp" line="131"/>
-        <source>This trip is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <source>Trip Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="137"/>
-        <location filename="../qt-ui/maintab.cpp" line="139"/>
-        <source>This dive is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="296"/>
+        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <source>Trip Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="286"/>
-        <source>Trip Location</source>
+        <location filename="../qt-ui/maintab.cpp" line="134"/>
+        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="288"/>
-        <source>Trip Notes</source>
+        <location filename="../qt-ui/maintab.cpp" line="143"/>
+        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
-        <location filename="../qt-ui/maintab.cpp" line="337"/>
-        <location filename="../qt-ui/maintab.cpp" line="338"/>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="146"/>
+        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <source>This dive is being edited. Select Save or Cancel when done.</source>
+        <translation type="unfinished"></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"/>
         <source>/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <source>unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
@@ -901,308 +1041,396 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="218"/>
+        <source>Filter</source>
+        <translation type="unfinished">Filter</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/mainwindow.ui" line="177"/>
-        <source>File</source>
+        <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="196"/>
-        <source>Log</source>
+        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <source>&amp;Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="211"/>
-        <source>View</source>
+        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="226"/>
-        <source>Filter</source>
-        <translation type="unfinished">Filter</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="232"/>
-        <source>Help</source>
+        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <source>&amp;Import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="245"/>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>&amp;New logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <source>&amp;Open logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="256"/>
+        <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
+        <location filename="../qt-ui/mainwindow.ui" line="281"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
+        <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="277"/>
+        <location filename="../qt-ui/mainwindow.ui" line="292"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="285"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="176"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <source>Export UDDF</source>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <source>Export &amp;UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
-        <source>Print</source>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <source>Ctrl+U</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="301"/>
-        <source>Ctrl+P</source>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <source>&amp;Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
-        <source>Preferences</source>
+        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <source>Ctrl+,</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="311"/>
-        <source>Quit</source>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
-        <source>Ctrl+Q</source>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <source>Import from &amp;dive computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <source>Download from Dive computer</source>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
-        <source>Ctrl+D</source>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <source>Ctrl+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="327"/>
-        <source>Download from Web Service</source>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <source>&amp;Edit Device Names</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="332"/>
-        <source>Edit Device Names</source>
-        <translation type="unfinished">Muuda seadmete nime</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <source>Ctrl++</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="337"/>
-        <source>Add Dive</source>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <source>&amp;Renumber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
-        <source>Renumber</source>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Ctrl+R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
-        <source>Auto Group</source>
+        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <source>Toggle &amp;Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
-        <source>Toggle Zoom</source>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <source>&amp;Yearly Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
-        <source>Yearly Statistics</source>
+        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <source>Ctrl+Y</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
-        <source>View List</source>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Dive List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="365"/>
-        <source>Ctrl+2</source>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
-        <source>View Profile</source>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="373"/>
-        <source>Ctrl+3</source>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
-        <source>View Info</source>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <source>User &amp;Manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="381"/>
-        <source>Ctrl+4</source>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <source>Globe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="386"/>
-        <source>View All</source>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <source>P&amp;lan Dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="389"/>
-        <source>Ctrl+1</source>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <source>Ctrl+L</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
-        <source>Prev DC</source>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <source>Import CSV</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
-        <source>Left</source>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <source>Import CS&amp;V</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="402"/>
-        <source>Next DC</source>
+        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <source>Import from Divelogs.de</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="405"/>
-        <source>Right</source>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <source>Ctrl+P</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="410"/>
-        <source>Select Events</source>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
-        <source>Input Plan</source>
+        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
-        <source>About Subsurface</source>
+        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <source>Ctrl+D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="425"/>
-        <source>User Manual</source>
+        <source>Edit Device Names</source>
+        <translation type="obsolete">Muuda seadmete nime</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <source>Add Dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
-        <source>F1</source>
+        <location filename="../qt-ui/mainwindow.ui" line="386"/>
+        <source>Auto Group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <source>Ctrl+2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <source>Ctrl+3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <source>Ctrl+4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="433"/>
-        <source>View Globe</source>
+        <location filename="../qt-ui/mainwindow.ui" line="431"/>
+        <source>Ctrl+1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="436"/>
-        <source>Ctrl+5</source>
+        <source>Prev DC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="441"/>
-        <source>Dive Planner</source>
+        <location filename="../qt-ui/mainwindow.ui" line="439"/>
+        <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="108"/>
-        <source>Open File</source>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
+        <source>Next DC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="447"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="452"/>
+        <source>Select Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="271"/>
-        <source>manually added dive</source>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <source>Input Plan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <source>About Subsurface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
+        <source>F1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="478"/>
+        <source>Ctrl+5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
+        <source>Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="448"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="450"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="455"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="456"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="695"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="696"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="144"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="250"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="286"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="197"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1265,215 +1493,235 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="218"/>
+        <location filename="../qt-ui/preferences.ui" line="199"/>
+        <source>Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="205"/>
+        <source>Use Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="225"/>
+        <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="235"/>
+        <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="245"/>
+        <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="269"/>
+        <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
         <translation type="unfinished">Sügavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="276"/>
+        <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="286"/>
+        <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
         <translation type="unfinished">Jalg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="303"/>
+        <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
         <translation type="unfinished">Bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="313"/>
+        <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="330"/>
+        <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="340"/>
+        <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="350"/>
+        <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="357"/>
+        <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="377"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="464"/>
+        <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="472"/>
+        <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="495"/>
-        <location filename="../qt-ui/preferences.ui" line="536"/>
-        <location filename="../qt-ui/preferences.ui" line="577"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="513"/>
+        <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="554"/>
+        <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="595"/>
+        <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="618"/>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="634"/>
+        <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="643"/>
+        <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="666"/>
+        <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="677"/>
+        <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="700"/>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="710"/>
+        <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="721"/>
-        <source>Show time</source>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
+        <source>Calculate NDL/TTS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="733"/>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>Show SAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
+        <source>GFLow at max depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="739"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
-        <source>XML Files (*.xml)</source>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1611,51 +1859,86 @@ Please, remove them first.</source>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="257"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="259"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <source>Hide events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <source>Hide all %1 events?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <source>Remove the selected event?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <source>%1 @ %2:%3</source>
+        <translation type="unfinished"></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>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="337"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="383"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="384"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="582"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="850"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <source>Measure properties of dive segments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
+        <source>Scale your dive to screen size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="584"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="851"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="859"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="861"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished">algus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="862"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished">lõpp</translation>
@@ -1664,62 +1947,62 @@ Please, remove them first.</source>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1497"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1502"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1505"/>
+        <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1512"/>
+        <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1517"/>
+        <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
         <translation type="unfinished">Balloon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1519"/>
+        <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1547"/>
+        <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1549"/>
+        <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1551"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1564"/>
+        <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1570"/>
+        <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1728,30 +2011,22 @@ Please, remove them first.</source>
     <name>QObject</name>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="44"/>
         <source>AIR</source>
         <translation type="unfinished">ÕHK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="38"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="45"/>
-        <source>EAN32</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="46"/>
-        <source>EAN36</source>
+        <location filename="../qt-ui/diveplanner.cpp" line="723"/>
+        <source>Remove this Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="47"/>
-        <source>Choose Gas</source>
+        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <source>No location data - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="188"/>
-        <source>No location data - move the map and double-click to set the dive location</source>
+        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1760,17 +2035,17 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="26"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation type="unfinished">Keskmine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="29"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1789,92 +2064,95 @@ Please, remove them first.</source>
     </message>
 </context>
 <context>
-    <name>SubsurfaceAbout</name>
+    <name>ShiftTimesDialog</name>
     <message>
-        <location filename="../qt-ui/about.ui" line="23"/>
-        <source>About Subsurface</source>
+        <location filename="../qt-ui/shifttimes.ui" line="14"/>
+        <source>Shift selected times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
+        <location filename="../qt-ui/shifttimes.ui" line="35"/>
+        <source>Shift times of selected dives by</source>
         <translation type="unfinished"></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>
+        <location filename="../qt-ui/shifttimes.ui" line="80"/>
+        <source>h:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="22"/>
-        <source>&amp;License</source>
+        <location filename="../qt-ui/shifttimes.ui" line="90"/>
+        <source>earlier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
-        <source>&amp;Website</source>
+        <location filename="../qt-ui/shifttimes.ui" line="97"/>
+        <source>later</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SubsurfaceWebServices</name>
+    <name>SubsurfaceAbout</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="14"/>
-        <source>Download Location Data</source>
+        <location filename="../qt-ui/about.ui" line="23"/>
+        <source>About Subsurface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="37"/>
-        <source>Download</source>
+        <location filename="../qt-ui/about.ui" line="64"/>
+        <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="44"/>
-        <source>Enter your ID here</source>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="51"/>
-        <source>User ID</source>
+        <location filename="../qt-ui/about.cpp" line="22"/>
+        <source>&amp;License</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="58"/>
-        <source>Status:</source>
+        <location filename="../qt-ui/about.cpp" line="23"/>
+        <source>&amp;Website</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="49"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="90"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="106"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="130"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
         <translation type="unfinished">Viga ühendamisel:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="133"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1895,17 +2173,17 @@ Please, remove them first.</source>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Bar</source>
         <translation type="unfinished">Bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1913,7 +2191,7 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1393"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1921,96 +2199,139 @@ Please, remove them first.</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>WebServices</name>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="14"/>
+        <source>Download Location Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="20"/>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="27"/>
+        <source>Enter your ID here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="34"/>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="58"/>
+        <source>User ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="72"/>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="86"/>
+        <source>Upload</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="460"/>
+        <source>Clicking here will remove this weigthsystem.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
- &gt; Month</source>
+ &gt; Month / Trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1307"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1310"/>
+        <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1311"/>
+        <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1312"/>
-        <location filename="../qt-ui/models.cpp" line="1315"/>
-        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <location filename="../qt-ui/models.cpp" line="1418"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1313"/>
-        <location filename="../qt-ui/models.cpp" line="1316"/>
-        <location filename="../qt-ui/models.cpp" line="1319"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"></translation>
@@ -2019,91 +2340,70 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="44"/>
+        <location filename="../dive.c" line="57"/>
         <source>pascal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="48"/>
-        <location filename="../qt-gui.cpp" line="323"/>
+        <location filename="../dive.c" line="61"/>
+        <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="52"/>
-        <location filename="../qt-gui.cpp" line="326"/>
+        <location filename="../dive.c" line="65"/>
+        <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="88"/>
-        <location filename="../qt-gui.cpp" line="304"/>
+        <location filename="../dive.c" line="101"/>
+        <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="93"/>
-        <location filename="../qt-gui.cpp" line="307"/>
+        <location filename="../dive.c" line="106"/>
+        <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="121"/>
-        <location filename="../qt-gui.cpp" line="207"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="126"/>
-        <location filename="../qt-gui.cpp" line="210"/>
+        <location filename="../dive.c" line="139"/>
+        <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="170"/>
-        <location filename="../qt-gui.cpp" line="233"/>
+        <location filename="../dive.c" line="183"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
-        <location filename="../qt-gui.cpp" line="231"/>
+        <location filename="../dive.c" line="187"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="966"/>
+        <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
         <translation type="unfinished">(%s) või (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="473"/>
-        <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="490"/>
-        <source>%1$s %2$d, %3$d
-%4$02d:%5$02d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="512"/>
-        <source>%1$s %2$d (%3$d dives)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="519"/>
-        <source>%1$s %2$d (1 dive)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="550"/>
-        <location filename="../planner.c" line="94"/>
-        <location filename="../planner.c" line="748"/>
-        <location filename="../planner.c" line="749"/>
-        <location filename="../statistics.c" line="360"/>
-        <location filename="../statistics.c" line="371"/>
+        <location filename="../divelist.c" line="488"/>
+        <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"/>
         <source>air</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2133,307 +2433,315 @@ Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../file.c" line="106"/>
-        <location filename="../file.c" line="108"/>
-        <location filename="../file.c" line="303"/>
-        <location filename="../file.c" line="305"/>
+        <location filename="../file.c" line="107"/>
+        <location filename="../file.c" line="109"/>
+        <location filename="../file.c" line="308"/>
+        <location filename="../file.c" line="310"/>
+        <location filename="../file.c" line="390"/>
+        <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <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>
+    </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>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
         <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="157"/>
+        <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="390"/>
+        <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="396"/>
+        <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="405"/>
+        <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="427"/>
+        <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="437"/>
+        <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="447"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="469"/>
+        <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="613"/>
+        <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="621"/>
+        <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="663"/>
+        <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="668"/>
+        <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="672"/>
+        <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="690"/>
+        <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="549"/>
+        <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1695"/>
+        <location filename="../parse-xml.c" line="1717"/>
         <source>Failed to parse &apos;%s&apos;.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1696"/>
+        <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1894"/>
+        <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1929"/>
+        <location filename="../parse-xml.c" line="1951"/>
         <source>Database connection failed &apos;%s&apos;.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1936"/>
+        <location filename="../parse-xml.c" line="1958"/>
         <source>Database query failed &apos;%s&apos;.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2048"/>
+        <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="96"/>
-        <location filename="../statistics.c" line="363"/>
+        <location filename="../planner.c" line="98"/>
+        <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="131"/>
+        <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="192"/>
         <source>Cylinder for planning</source>
-        <translation type="unfinished">Balloon planeerimiseks</translation>
-    </message>
-    <message>
-        <location filename="../planner.c" line="217"/>
-        <source>Simulated Dive</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Balloon planeerimiseks</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="294"/>
+        <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="472"/>
+        <location filename="../planner.c" line="493"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -2442,161 +2750,150 @@ based on GFlow = %.0f and GFhigh = %.0f
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="513"/>
+        <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="522"/>
+        <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="552"/>
+        <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="776"/>
         <source>ean</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1154"/>
-        <source>D:%.1f %s</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1158"/>
-        <source>%s
-T:%d:%02d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1177"/>
+        <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1189"/>
+        <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
-        <source>%s
-Safetystop:unkn time @ %.0f %s</source>
+        <location filename="../profile.c" line="1199"/>
+        <source>@:%d:%02d
+D:%.1f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1219"/>
         <source>%s
-Deco:%umin @ %.0f %s</source>
+SAC:%2.1fl/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1211"/>
+        <location filename="../profile.c" line="1258"/>
         <source>%s
-Deco:unkn time @ %.0f %s</source>
+Safetystop:unkn time @ %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1217"/>
+        <location filename="../profile.c" line="1263"/>
         <source>%s
-In deco</source>
-        <translation type="unfinished">%s⏎ Decos</translation>
+Deco:%umin @ %.0f %s</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
+        <location filename="../profile.c" line="1266"/>
         <source>%s
-NDL:-</source>
+Deco:unkn time @ %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1272"/>
         <source>%s
-NDL:%umin</source>
-        <translation type="unfinished"></translation>
+In deco</source>
+        <translation type="unfinished">%s⏎ Decos</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
+        <location filename="../profile.c" line="1275"/>
         <source>%s
-TTS:%umin</source>
+NDL:%umin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1223"/>
         <source>%s
 CNS:%u%%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1227"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation type="unfinished">%s⏎ pO%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1231"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation type="unfinished">%s⏎ pN%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1243"/>
+        <location filename="../profile.c" line="1235"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation type="unfinished">%s⏎ pHe:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1240"/>
         <source>%s
 MOD:%d%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1247"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -2604,295 +2901,330 @@ EADD:%d%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1349"/>
+        <location filename="../profile.c" line="1280"/>
+        <source>%s
+Deco:%umin @ %.0f %s (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1289"/>
+        <source>%s
+In deco (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>%s
+NDL:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1296"/>
+        <source>%s
+TTS:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
-        <location filename="../profile.c" line="1357"/>
+        <location filename="../profile.c" line="1409"/>
+        <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1361"/>
+        <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1365"/>
+        <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1369"/>
-        <source>%s%sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1425"/>
+        <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1373"/>
-        <location filename="../profile.c" line="1377"/>
-        <source>%s %sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1429"/>
+        <location filename="../profile.c" line="1433"/>
+        <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1384"/>
+        <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="284"/>
+        <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="288"/>
+        <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
-        <source>invalid</source>
+        <location filename="../qt-gui.cpp" line="460"/>
+        <source>%1, %2 %3, %4 %5:%6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../qt-gui.cpp" line="473"/>
+        <source>%1 %2, %3
+%4:%5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="486"/>
+        <source>%1 %2 (%3 dives)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="491"/>
+        <source>%1 %2 (1 dive)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="13"/>
         <source>boat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>shore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>drift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>deep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>cavern</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="14"/>
         <source>ice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>wreck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>cave</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>altitude</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>pool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>lake</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="16"/>
         <source>river</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="17"/>
         <source>night</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
-        <source>freshwater</source>
+        <location filename="../dive.c" line="17"/>
+        <source>fresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
-        <source>training</source>
+        <location filename="../dive.c" line="17"/>
+        <source>student</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
-        <source>teaching</source>
+        <location filename="../dive.c" line="18"/>
+        <source>photo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
-        <source>photo</source>
+        <location filename="../dive.c" line="18"/>
+        <source>video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
-        <source>video</source>
+        <location filename="../dive.c" line="18"/>
+        <source>instructor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="19"/>
         <source>deco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="199"/>
+        <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="205"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="207"/>
+        <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
         <translation type="unfinished">%dt %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="218"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="225"/>
+        <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="260"/>
+        <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="262"/>
+        <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="264"/>
+        <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="266"/>
+        <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
         <translation type="unfinished">(pole sukeldumisi)</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="363"/>
-        <source>, EAN%d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/translations/subsurface_fi_FI.ts b/translations/subsurface_fi_FI.ts
index 467f1c041..4fdba8729 100644
--- a/translations/subsurface_fi_FI.ts
+++ b/translations/subsurface_fi_FI.ts
@@ -2314,42 +2314,135 @@ Miika Turkia</translation>
     </message>
 </context>
 <context>
+    <name>CSVImportDialog</name>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <source>Import File (CSV)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <source>Field Separator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <source>Field Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <source>Time</source>
+        <translation type="unfinished">Kello</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <source>Depth</source>
+        <translation type="unfinished">Syvyys</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <source>Temp</source>
+        <translation type="unfinished">Lämpötila</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
+        <source>Po2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <source>Cns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <source>Stopdepth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <source>Pre-configured imports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>Open CSV Log File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>CSV Files (*.csv)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
         <translation type="unfinished">Tyyppi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
         <translation type="unfinished">Tilavuus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="65"/>
+        <source>Switch at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="163"/>
+        <source>Clicking here will remove this cylinder.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="385"/>
+        <source>Cylinder cannot be removed</source>
+        <translation type="unfinished"></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>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
@@ -2373,30 +2466,35 @@ Miika Turkia</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Device ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Model</source>
         <translation type="unfinished">Malli</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
         <translation type="unfinished">Lempinimi</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <source>Clicking here will remove this divecomputer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1009"/>
+        <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1011"/>
+        <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2404,186 +2502,206 @@ Miika Turkia</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="39"/>
+        <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="398"/>
+        <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="399"/>
+        <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="400"/>
-        <source>collapse</source>
+        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <source>collapse others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="402"/>
-        <source>remove dive from trip</source>
+        <location filename="../qt-ui/divelistview.cpp" line="638"/>
+        <source>remove dive(s) from trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="405"/>
-        <source>Merge trip with trip above</source>
-        <translation type="unfinished">Liitä retki yllä olevaan retkeen</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="639"/>
+        <source>create new trip above</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="406"/>
-        <source>Merge trip with trip below</source>
-        <translation type="unfinished">Liitä retki alla olevaan retkeen</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="640"/>
+        <source>add dive(s) to trip immideately above</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="410"/>
-        <source>delete dive</source>
+        <location filename="../qt-ui/divelistview.cpp" line="643"/>
+        <source>merge trip with trip above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="412"/>
-        <source>merge selected dives</source>
+        <location filename="../qt-ui/divelistview.cpp" line="644"/>
+        <source>merge trip with trip below</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../qt-ui/divelistview.cpp" line="648"/>
+        <source>delete dive(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
-        <source>Bottom SAC</source>
+        <location filename="../qt-ui/divelistview.cpp" line="652"/>
+        <source>save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
-        <source>High GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="653"/>
+        <source>export As UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
-        <source>SAC on DECO Stop</source>
+        <location filename="../qt-ui/divelistview.cpp" line="654"/>
+        <source>shift times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
-        <source>Low GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
+        <source>Save Dives As...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="114"/>
-        <source>Last Stop at 6m</source>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
+        <source>Save File as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="141"/>
-        <source>Start Time</source>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="148"/>
-        <source>ATM Pressure</source>
+        <source>Merge trip with trip above</source>
+        <translation type="obsolete">Liitä retki yllä olevaan retkeen</translation>
+    </message>
+    <message>
+        <source>Merge trip with trip below</source>
+        <translation type="obsolete">Liitä retki alla olevaan retkeen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <source>merge selected dives</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DivePlannerGraphics</name>
+    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="143"/>
-        <source>10m</source>
+        <location filename="../qt-ui/diveplanner.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="145"/>
-        <source>30ft</source>
+        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <source>Bottom SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="146"/>
-        <source>Increase maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <source>SAC on DECO Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="147"/>
-        <source>Decreases maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <source>Increase minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>10min</source>
+        <location filename="../qt-ui/diveplanner.ui" line="108"/>
+        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>Decreases minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <source>Last Stop at 6m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
-        <source>Handler Position Error</source>
+        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="386"/>
-        <source>One or more of your stops will be lost with this operations, 
-Please, remove them first.</source>
+        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <source>ATM Pressure</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DivePlannerGraphics</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <source>10m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="136"/>
+        <source>30ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <source>Handler Position Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="415"/>
-        <source>Air</source>
+        <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>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="420"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="421"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="424"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="425"/>
-        <source>Air</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <source>AIR</source>
+        <translation type="unfinished">Ilma</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="986"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="987"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
         <translation type="unfinished">Kesto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="988"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="989"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1141"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1142"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2591,75 +2709,85 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="851"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="937"/>
+        <source>Available Gases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <source>add dive data point</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1051"/>
+        <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
         <translation type="unfinished">#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1052"/>
+        <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
         <translation type="unfinished">Ajankohta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
         <translation type="unfinished">m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
         <translation type="unfinished">ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1055"/>
+        <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
         <translation type="unfinished">min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
         <translation type="unfinished">pauna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1058"/>
+        <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
         <translation type="unfinished">Puku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1059"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
         <translation type="unfinished">Säiliöt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1061"/>
+        <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
         <translation type="unfinished">Pintakulutus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1062"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
         <translation type="unfinished">Happikertymä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1063"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
         <translation type="unfinished">maxCNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1064"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
         <translation type="unfinished">Kohde</translation>
     </message>
@@ -2667,14 +2795,20 @@ Please, remove them first.</source>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="138"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
         <translation type="unfinished">Virhe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="142"/>
-        <source>retry</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
+        <source>Retry</source>
+        <translation type="unfinished">Yritä uudestaan</translation>
     </message>
 </context>
 <context>
@@ -2734,6 +2868,7 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
         <translation type="unfinished">Muistiinpanot</translation>
     </message>
@@ -2748,225 +2883,238 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <source>M/d/yy h:mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="108"/>
-        <location filename="../qt-ui/maintab.cpp" line="307"/>
+        <location filename="../qt-ui/maintab.ui" line="112"/>
+        <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
         <translation type="unfinished">Kohde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="122"/>
+        <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="136"/>
+        <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
         <translation type="unfinished">Sukellusvanhin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="143"/>
+        <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
         <translation type="unfinished">Sukelluspari</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="166"/>
+        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
         <translation type="unfinished">Yleisarvio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="173"/>
+        <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
         <translation type="unfinished">Näkyvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="182"/>
+        <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
         <translation type="unfinished">Puku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="206"/>
-        <location filename="../qt-ui/maintab.cpp" line="308"/>
+        <location filename="../qt-ui/maintab.ui" line="217"/>
+        <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
         <translation type="unfinished">Muistiinpanot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="232"/>
+        <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
         <translation type="unfinished">Varusteet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="319"/>
+        <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
         <translation type="unfinished">Tiedot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="361"/>
+        <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
         <translation type="unfinished">Ajankohta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="380"/>
+        <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="399"/>
+        <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="418"/>
+        <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="437"/>
-        <location filename="../qt-ui/maintab.ui" line="692"/>
+        <location filename="../qt-ui/maintab.ui" line="466"/>
+        <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
         <translation type="unfinished">Pintakulutus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="456"/>
+        <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="475"/>
+        <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="494"/>
+        <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
         <translation type="unfinished">Happikertymä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="513"/>
+        <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="532"/>
+        <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="551"/>
+        <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="570"/>
+        <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
         <translation type="unfinished">Sukellusaika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="589"/>
+        <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
         <translation type="unfinished">Tilastot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="668"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation type="unfinished">Syvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="680"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation type="unfinished">Lämpötila</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="704"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation type="unfinished">Kesto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="716"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation type="unfinished">Kokonaisaika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="735"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation type="unfinished">Sukelluskerrat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="68"/>
+        <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
         <translation type="unfinished">Säiliöt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="129"/>
-        <location filename="../qt-ui/maintab.cpp" line="131"/>
-        <source>This trip is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <source>Trip Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="137"/>
-        <location filename="../qt-ui/maintab.cpp" line="139"/>
-        <source>This dive is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="296"/>
+        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <source>Trip Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="286"/>
-        <source>Trip Location</source>
+        <location filename="../qt-ui/maintab.cpp" line="134"/>
+        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="288"/>
-        <source>Trip Notes</source>
+        <location filename="../qt-ui/maintab.cpp" line="143"/>
+        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
-        <location filename="../qt-ui/maintab.cpp" line="337"/>
-        <location filename="../qt-ui/maintab.cpp" line="338"/>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="146"/>
+        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <source>This dive is being edited. Select Save or Cancel when done.</source>
+        <translation type="unfinished"></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"/>
         <source>/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <source>unknown</source>
+        <translation type="unfinished">tuntematon</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
         <translation type="unfinished">N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
         <translation type="unfinished">S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
         <translation type="unfinished">E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
         <translation type="unfinished">W</translation>
     </message>
@@ -2979,308 +3127,432 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="177"/>
         <source>File</source>
-        <translation type="unfinished">Tiedosto</translation>
+        <translation type="obsolete">Tiedosto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="196"/>
         <source>Log</source>
-        <translation type="unfinished">Loki</translation>
+        <translation type="obsolete">Loki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="211"/>
         <source>View</source>
-        <translation type="unfinished">Näytä</translation>
+        <translation type="obsolete">Näytä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="226"/>
+        <location filename="../qt-ui/mainwindow.ui" line="218"/>
         <source>Filter</source>
         <translation type="unfinished">Suodattimet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="232"/>
         <source>Help</source>
-        <translation type="unfinished">Ohje</translation>
+        <translation type="obsolete">Ohje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="245"/>
+        <location filename="../qt-ui/mainwindow.ui" line="177"/>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <source>&amp;Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <source>&amp;View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <source>&amp;Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>&amp;New logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
         <translation type="unfinished">Uusi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <source>&amp;Open logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="256"/>
+        <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
+        <location filename="../qt-ui/mainwindow.ui" line="281"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation type="unfinished">Tallenna nimellä...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
+        <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="277"/>
+        <location filename="../qt-ui/mainwindow.ui" line="292"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation type="unfinished">Sulje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="285"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="176"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <source>Export UDDF</source>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <source>Export &amp;UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
-        <source>Print</source>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <source>Ctrl+U</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="301"/>
-        <source>Ctrl+P</source>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <source>&amp;Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
-        <source>Preferences</source>
-        <translation type="unfinished">Asetukset</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <source>Ctrl+,</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="311"/>
-        <source>Quit</source>
-        <translation type="unfinished">Lopeta</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
-        <source>Ctrl+Q</source>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <source>Import from &amp;dive computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <source>Download from Dive computer</source>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
-        <source>Ctrl+D</source>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <source>Ctrl+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="327"/>
-        <source>Download from Web Service</source>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <source>&amp;Edit Device Names</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="332"/>
-        <source>Edit Device Names</source>
-        <translation type="unfinished">Muokkaa laitenimeä</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <source>Ctrl++</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="337"/>
-        <source>Add Dive</source>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <source>&amp;Renumber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
-        <source>Renumber</source>
-        <translation type="unfinished">Uudellennumeroi</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Ctrl+R</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
-        <source>Auto Group</source>
+        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <source>Toggle &amp;Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
-        <source>Toggle Zoom</source>
-        <translation type="unfinished">Venytä sukellusprofiilikuvaajaa</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <source>&amp;Yearly Statistics</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
-        <source>Yearly Statistics</source>
-        <translation type="unfinished">Vuositilastot</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <source>Ctrl+Y</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
-        <source>View List</source>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Dive List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="365"/>
-        <source>Ctrl+2</source>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <source>Profile</source>
+        <translation type="unfinished">Profiilikuvaaja</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <source>Info</source>
+        <translation type="unfinished">Tiedot</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
-        <source>View Profile</source>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <source>User &amp;Manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="373"/>
-        <source>Ctrl+3</source>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <source>Globe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
-        <source>View Info</source>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <source>P&amp;lan Dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="381"/>
-        <source>Ctrl+4</source>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <source>Ctrl+L</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <source>Import CSV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <source>Import CS&amp;V</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <source>Import from Divelogs.de</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <source>Preferences</source>
+        <translation type="unfinished">Asetukset</translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="obsolete">Lopeta</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <source>Ctrl+D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Device Names</source>
+        <translation type="obsolete">Muokkaa laitenimeä</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <source>Add Dive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Renumber</source>
+        <translation type="obsolete">Uudellennumeroi</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/mainwindow.ui" line="386"/>
-        <source>View All</source>
+        <source>Auto Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="389"/>
+        <source>Toggle Zoom</source>
+        <translation type="obsolete">Venytä sukellusprofiilikuvaajaa</translation>
+    </message>
+    <message>
+        <source>Yearly Statistics</source>
+        <translation type="obsolete">Vuositilastot</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <source>Ctrl+2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <source>Ctrl+3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <source>Ctrl+4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>Ctrl+1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Prev DC</source>
         <translation type="unfinished">Edellinen tietokone</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
+        <location filename="../qt-ui/mainwindow.ui" line="439"/>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="402"/>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Next DC</source>
         <translation type="unfinished">Seuraava tietokone</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="405"/>
+        <location filename="../qt-ui/mainwindow.ui" line="447"/>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="410"/>
+        <location filename="../qt-ui/mainwindow.ui" line="452"/>
         <source>Select Events</source>
         <translation type="unfinished">Valitse tapahtumat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
         <source>Input Plan</source>
         <translation type="unfinished">Suunnittele</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
         <source>About Subsurface</source>
         <translation type="unfinished">Tietoja Subsurfacesta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>User Manual</source>
-        <translation type="unfinished">Käyttöohje</translation>
+        <translation type="obsolete">Käyttöohje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>F1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="433"/>
-        <source>View Globe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="478"/>
         <source>Ctrl+5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="441"/>
-        <source>Dive Planner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="108"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Open File</source>
         <translation type="unfinished">Avaa tiedosto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="271"/>
-        <source>manually added dive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="448"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="450"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="455"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
         <translation type="unfinished">Tallenna muutokset?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="456"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="695"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="696"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="144"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="250"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="286"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="197"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3343,215 +3615,235 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="218"/>
+        <location filename="../qt-ui/preferences.ui" line="199"/>
+        <source>Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="205"/>
+        <source>Use Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="225"/>
+        <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="235"/>
+        <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="245"/>
+        <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="269"/>
+        <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
         <translation type="unfinished">Syvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="276"/>
+        <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
         <translation type="unfinished">metri</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="286"/>
+        <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
         <translation type="unfinished">jalka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
         <translation type="unfinished">Paine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="303"/>
+        <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
         <translation type="unfinished">bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="313"/>
+        <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="330"/>
+        <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
         <translation type="unfinished">litra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="340"/>
+        <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
         <translation type="unfinished">kuutiojalka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="350"/>
+        <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
         <translation type="unfinished">Lämpötila</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="357"/>
+        <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
         <translation type="unfinished">Celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
         <translation type="unfinished">Fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="377"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
         <translation type="unfinished">Painot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
         <translation type="unfinished">pauna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="464"/>
+        <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="472"/>
+        <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="495"/>
-        <location filename="../qt-ui/preferences.ui" line="536"/>
-        <location filename="../qt-ui/preferences.ui" line="577"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="513"/>
+        <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="554"/>
+        <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="595"/>
+        <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="618"/>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="634"/>
+        <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="643"/>
+        <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="666"/>
+        <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="677"/>
+        <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="700"/>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="710"/>
+        <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="721"/>
-        <source>Show time</source>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
+        <source>Calculate NDL/TTS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="733"/>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>Show SAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
+        <source>GFLow at max depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="739"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
-        <source>XML Files (*.xml)</source>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3689,51 +3981,86 @@ Please, remove them first.</source>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="257"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="259"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <source>Hide events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <source>Hide all %1 events?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <source>Remove the selected event?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <source>%1 @ %2:%3</source>
+        <translation type="unfinished"></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>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="337"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="383"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="384"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="582"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="850"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <source>Measure properties of dive segments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
+        <source>Scale your dive to screen size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
+        <source>Edit</source>
+        <translation type="unfinished">Muuta</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
         <translation type="unfinished">ilma</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="584"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="851"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="859"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
         <translation type="unfinished">Vaihto avoimeen ilman kiertoon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="861"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished">alku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="862"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished">loppu</translation>
@@ -3742,62 +4069,62 @@ Please, remove them first.</source>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1497"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
         <translation type="unfinished">tuntematon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1502"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1505"/>
+        <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1512"/>
+        <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1517"/>
+        <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
         <translation type="unfinished">Säiliö</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1519"/>
+        <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
         <translation type="unfinished">Kaasuseos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1547"/>
+        <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
         <translation type="unfinished">Pintakulutus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1549"/>
+        <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
         <translation type="unfinished">Max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1551"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
         <translation type="unfinished">Happikertymä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1564"/>
+        <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1570"/>
+        <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3806,30 +4133,30 @@ Please, remove them first.</source>
     <name>QObject</name>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="44"/>
         <source>AIR</source>
         <translation type="unfinished">Ilma</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="38"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="45"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="723"/>
+        <source>Remove this Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>EAN32</source>
-        <translation type="unfinished">EAN32</translation>
+        <translation type="obsolete">EAN32</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="46"/>
         <source>EAN36</source>
-        <translation type="unfinished">EAN36</translation>
+        <translation type="obsolete">EAN36</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="47"/>
-        <source>Choose Gas</source>
+        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <source>No location data - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="188"/>
-        <source>No location data - move the map and double-click to set the dive location</source>
+        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3838,17 +4165,17 @@ Please, remove them first.</source>
         <translation type="unfinished">Sulje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="26"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation type="unfinished">Keskim.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="29"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3867,92 +4194,95 @@ Please, remove them first.</source>
     </message>
 </context>
 <context>
-    <name>SubsurfaceAbout</name>
+    <name>ShiftTimesDialog</name>
     <message>
-        <location filename="../qt-ui/about.ui" line="23"/>
-        <source>About Subsurface</source>
-        <translation type="unfinished">Tietoja Subsurfacesta</translation>
+        <location filename="../qt-ui/shifttimes.ui" line="14"/>
+        <source>Shift selected times</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
+        <location filename="../qt-ui/shifttimes.ui" line="35"/>
+        <source>Shift times of selected dives by</source>
         <translation type="unfinished"></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>
+        <location filename="../qt-ui/shifttimes.ui" line="80"/>
+        <source>h:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="22"/>
-        <source>&amp;License</source>
+        <location filename="../qt-ui/shifttimes.ui" line="90"/>
+        <source>earlier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
-        <source>&amp;Website</source>
+        <location filename="../qt-ui/shifttimes.ui" line="97"/>
+        <source>later</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SubsurfaceWebServices</name>
+    <name>SubsurfaceAbout</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="14"/>
-        <source>Download Location Data</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/about.ui" line="23"/>
+        <source>About Subsurface</source>
+        <translation type="unfinished">Tietoja Subsurfacesta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="37"/>
-        <source>Download</source>
+        <location filename="../qt-ui/about.ui" line="64"/>
+        <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="44"/>
-        <source>Enter your ID here</source>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="51"/>
-        <source>User ID</source>
+        <location filename="../qt-ui/about.cpp" line="22"/>
+        <source>&amp;License</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="58"/>
-        <source>Status:</source>
+        <location filename="../qt-ui/about.cpp" line="23"/>
+        <source>&amp;Website</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="49"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
         <translation type="unfinished">Verkkopalvelu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="90"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="106"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="130"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
         <translation type="unfinished">Yhteysvirhe:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
         <translation type="unfinished">Tuntematon käyttäjä!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
         <translation type="unfinished">Vastauksen jäsentäminen ei onnistu!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="133"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
         <translation type="unfinished">Lataus onnistui!</translation>
     </message>
@@ -3973,17 +4303,17 @@ Please, remove them first.</source>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Bar</source>
         <translation type="unfinished">bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3991,7 +4321,7 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1393"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3999,96 +4329,139 @@ Please, remove them first.</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>WebServices</name>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="14"/>
+        <source>Download Location Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="20"/>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="27"/>
+        <source>Enter your ID here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="34"/>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="58"/>
+        <source>User ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="72"/>
+        <source>Password</source>
+        <translation type="unfinished">Salasana</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="86"/>
+        <source>Upload</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
         <translation type="unfinished">Tyyppi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
         <translation type="unfinished">Painot</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="460"/>
+        <source>Clicking here will remove this weigthsystem.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
- &gt; Month</source>
+ &gt; Month / Trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
         <translation type="unfinished">#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1307"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1310"/>
+        <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1311"/>
+        <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1312"/>
-        <location filename="../qt-ui/models.cpp" line="1315"/>
-        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <location filename="../qt-ui/models.cpp" line="1418"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1313"/>
-        <location filename="../qt-ui/models.cpp" line="1316"/>
-        <location filename="../qt-ui/models.cpp" line="1319"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"></translation>
@@ -4097,91 +4470,74 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="44"/>
+        <location filename="../dive.c" line="57"/>
         <source>pascal</source>
         <translation type="unfinished">Pa</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="48"/>
-        <location filename="../qt-gui.cpp" line="323"/>
+        <location filename="../dive.c" line="61"/>
+        <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
         <translation type="unfinished">bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="52"/>
-        <location filename="../qt-gui.cpp" line="326"/>
+        <location filename="../dive.c" line="65"/>
+        <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
         <translation type="unfinished">psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="88"/>
-        <location filename="../qt-gui.cpp" line="304"/>
+        <location filename="../dive.c" line="101"/>
+        <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
         <translation type="unfinished">l</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="93"/>
-        <location filename="../qt-gui.cpp" line="307"/>
+        <location filename="../dive.c" line="106"/>
+        <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
         <translation type="unfinished">ft³</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="121"/>
-        <location filename="../qt-gui.cpp" line="207"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
         <translation type="unfinished">m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="126"/>
-        <location filename="../qt-gui.cpp" line="210"/>
+        <location filename="../dive.c" line="139"/>
+        <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
         <translation type="unfinished">ft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="170"/>
-        <location filename="../qt-gui.cpp" line="233"/>
+        <location filename="../dive.c" line="183"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
         <translation type="unfinished">pauna</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
-        <location filename="../qt-gui.cpp" line="231"/>
+        <location filename="../dive.c" line="187"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="966"/>
+        <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
         <translation type="unfinished">(%s) tai (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="473"/>
         <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <translation type="unfinished">%1$s %3$d. %2$skuuta %4$d %5$2d:%6$02d</translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="490"/>
-        <source>%1$s %2$d, %3$d
-%4$02d:%5$02d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="512"/>
-        <source>%1$s %2$d (%3$d dives)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="519"/>
-        <source>%1$s %2$d (1 dive)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">%1$s %3$d. %2$skuuta %4$d %5$2d:%6$02d</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="550"/>
-        <location filename="../planner.c" line="94"/>
-        <location filename="../planner.c" line="748"/>
-        <location filename="../planner.c" line="749"/>
-        <location filename="../statistics.c" line="360"/>
-        <location filename="../statistics.c" line="371"/>
+        <location filename="../divelist.c" line="488"/>
+        <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"/>
         <source>air</source>
         <translation type="unfinished">ilma</translation>
     </message>
@@ -4211,312 +4567,324 @@ Maximum</source>
         <translation type="unfinished">clip-on</translation>
     </message>
     <message>
-        <location filename="../file.c" line="106"/>
-        <location filename="../file.c" line="108"/>
-        <location filename="../file.c" line="303"/>
-        <location filename="../file.c" line="305"/>
+        <location filename="../file.c" line="107"/>
+        <location filename="../file.c" line="109"/>
+        <location filename="../file.c" line="308"/>
+        <location filename="../file.c" line="310"/>
+        <location filename="../file.c" line="390"/>
+        <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation type="unfinished">Tiedoston &apos;%s&apos; avaaminen epäonnistui</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <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>
+    </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>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
         <translation type="unfinished">ei mitään</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
         <translation type="unfinished">deko-pysähdys</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
         <translation type="unfinished">pohja-aika</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
         <translation type="unfinished">nousu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
         <translation type="unfinished">katto</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
         <translation type="unfinished">työmäärä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
         <translation type="unfinished">lähetin</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
         <translation type="unfinished">rike</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
         <translation type="unfinished">kirjanmerkki</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
         <translation type="unfinished">pinta</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
         <translation type="unfinished">turvapysähdys</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
         <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
         <translation type="unfinished">Kaasun vaihto</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
         <translation type="unfinished">turvapysähdys (vapaaehtoinen)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
         <translation type="unfinished">turvapysähdys (pakollinen)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
         <translation type="unfinished">syväpysähdys</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
         <translation type="unfinished">katto (turvapysähdys)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
         <translation type="unfinished">sukellusaika</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
         <translation type="unfinished">Suurin syvyys</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
         <translation type="unfinished">Happikertymä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
         <translation type="unfinished">PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
         <translation type="unfinished">Ilma-aika</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
         <translation type="unfinished">rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
         <translation type="unfinished">suunta</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
         <translation type="unfinished">kudoskertymän varoitus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
         <translation type="unfinished">keskeytyksetön aika</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="157"/>
+        <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
         <translation type="unfinished">tuntematon tapahtumanumero</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="390"/>
+        <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
         <translation type="unfinished">Jäsentäjän luominen %s %s epäonnistui</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="396"/>
+        <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
         <translation type="unfinished">Virhe tiedon rekisteröinnissä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="405"/>
+        <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
         <translation type="unfinished">Virhe ajan jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
         <translation type="unfinished">Sukellus %1$d: %3$d. %2$skuuta %4$04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="427"/>
+        <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
         <translation type="unfinished">Virhe sukelluksen keston jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="437"/>
+        <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
         <translation type="unfinished">Virhe maksimisyvyyden jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="447"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
         <translation type="unfinished">Virhe kaasuseosten määrän jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
         <translation type="unfinished">Virhe veden suolapitoisuuden määrityksessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="469"/>
+        <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
         <translation type="unfinished">Virhe kaasuseoksen jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
         <translation type="unfinished">Virhe näytteiden tulkinnassa</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="613"/>
+        <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
         <translation type="unfinished">Tapahtuma: odotetaan käyttäjän toimia</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="621"/>
+        <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation type="unfinished">malli=%u (0x%08x), firmware=%u (0x%08x), sarjanumero=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="663"/>
+        <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
         <translation type="unfinished">Virhe tapahtumakäsittelijän rekisteröinnissä.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="668"/>
+        <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished">Virhe perumiskäsittelijän rekisteröinnissä.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="672"/>
+        <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
         <translation type="unfinished">Virhe sukellusten jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="690"/>
+        <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished">libdivecomputer-kontekstin luominen epäonnistui</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished">Avaaminen epäonnistui: %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="549"/>
+        <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
         <translation type="unfinished">Outo prosenttiosuus: %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1695"/>
+        <location filename="../parse-xml.c" line="1717"/>
         <source>Failed to parse &apos;%s&apos;.
 </source>
         <translation type="unfinished">Tiedoston &apos;%s&apos; lukeminen epäonnistui.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1696"/>
+        <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation type="unfinished">Tiedoston &apos;%s&apos; lukeminen epäonnistui.</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1894"/>
+        <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
         <translation type="unfinished">Tietokantakysely &apos;get_events&apos; (nouda tapahtumat) epäonnistui.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1929"/>
+        <location filename="../parse-xml.c" line="1951"/>
         <source>Database connection failed &apos;%s&apos;.
 </source>
         <translation type="unfinished">Tietokantayhteys epäonnistui &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1936"/>
+        <location filename="../parse-xml.c" line="1958"/>
         <source>Database query failed &apos;%s&apos;.
 </source>
         <translation type="unfinished">Tietokantakysely epäonnistui &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2048"/>
+        <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
         <translation type="unfinished">Konversiotiedoston avaus epäonnistui (%s)/%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="96"/>
-        <location filename="../statistics.c" line="363"/>
+        <location filename="../planner.c" line="98"/>
+        <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
         <translation type="unfinished">EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="131"/>
+        <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation type="unfinished">Seosta %d/%d ei löydy</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="192"/>
         <source>Cylinder for planning</source>
-        <translation type="unfinished">Suunnitelman säiliö</translation>
+        <translation type="obsolete">Suunnitelman säiliö</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="217"/>
         <source>Simulated Dive</source>
-        <translation type="unfinished">Simuloitu sukellus</translation>
+        <translation type="obsolete">Simuloitu sukellus</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="294"/>
+        <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
         <translation type="unfinished">Liian monta kaasuseosta</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="472"/>
+        <location filename="../planner.c" line="493"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -4529,180 +4897,173 @@ perustuu arvoihin GFlow = %.0f ja GFhigh = %.0f
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="513"/>
+        <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished">Siirtymä %.*f %s:n syvyyteen ajassa %d:%02d - aika %d:%02u kaasulla %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="522"/>
+        <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished">Pysy %.*f %s:n syvyydessä %d:%02d min - aika %d:%02u kaasulla %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
         <translation type="unfinished">Vaihda kaasu seuraavaan: %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
         <translation type="unfinished">Kaasun kulutus:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="552"/>
+        <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
         <translation type="unfinished">%.0f %s (%s)
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="776"/>
         <source>ean</source>
         <translation type="unfinished">ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1154"/>
         <source>D:%.1f %s</source>
-        <translation type="unfinished">S:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1158"/>
-        <source>%s
-T:%d:%02d</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">S:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
         <translation type="unfinished">%s
 P: %d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
         <translation type="unfinished">%s
 T: %.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1177"/>
+        <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation type="unfinished">%s
 Laskettu katto %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1189"/>
+        <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation type="unfinished">%s
 Turvapysähdys: %u min @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1199"/>
+        <source>@:%d:%02d
+D:%.1f %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1219"/>
+        <source>%s
+SAC:%2.1fl/min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation type="unfinished">%s
 Turvapysähdys: tuntemat. aika @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation type="unfinished">%s
 Deko: %u min @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1211"/>
+        <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation type="unfinished">%s
 Deko: tuntem. aika @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1217"/>
+        <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
         <translation type="unfinished">%s
 dekossa</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
-        <source>%s
-NDL:-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1275"/>
         <source>%s
 NDL:%umin</source>
         <translation type="unfinished">%s
 NDL: %u min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
-        <source>%s
-TTS:%umin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1223"/>
         <source>%s
 CNS:%u%%</source>
         <translation type="unfinished">%s
 CNS: %u %%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1227"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation type="unfinished">%s
 pO%s: %.2f bar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1231"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation type="unfinished">%s
 pN%s: %.2f bar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1243"/>
+        <location filename="../profile.c" line="1235"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation type="unfinished">%s
 pHe: %.2f bar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1240"/>
         <source>%s
 MOD:%d%s</source>
         <translation type="unfinished">%s
 MOD: %d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1247"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -4713,295 +5074,346 @@ END: %d %s
 EADD: %d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1349"/>
+        <location filename="../profile.c" line="1280"/>
+        <source>%s
+Deco:%umin @ %.0f %s (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1289"/>
+        <source>%s
+In deco (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>%s
+NDL:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1296"/>
+        <source>%s
+TTS:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
-        <location filename="../profile.c" line="1357"/>
+        <location filename="../profile.c" line="1409"/>
+        <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1361"/>
+        <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1365"/>
+        <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1369"/>
-        <source>%s%sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1425"/>
+        <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1373"/>
-        <location filename="../profile.c" line="1377"/>
-        <source>%s %sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1429"/>
+        <location filename="../profile.c" line="1433"/>
+        <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1384"/>
+        <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="284"/>
+        <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="288"/>
+        <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../qt-gui.cpp" line="460"/>
+        <source>%1, %2 %3, %4 %5:%6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="473"/>
+        <source>%1 %2, %3
+%4:%5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="486"/>
+        <source>%1 %2 (%3 dives)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="491"/>
+        <source>%1 %2 (1 dive)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>invalid</source>
-        <translation type="unfinished">epäkelpo</translation>
+        <translation type="obsolete">epäkelpo</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>boat</source>
         <translation type="unfinished">vene</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>shore</source>
         <translation type="unfinished">ranta</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>drift</source>
         <translation type="unfinished">virta</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>deep</source>
         <translation type="unfinished">syvä</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>cavern</source>
         <translation type="unfinished">luola (cavern)</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="14"/>
         <source>ice</source>
         <translation type="unfinished">jää</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>wreck</source>
         <translation type="unfinished">hylky</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>cave</source>
         <translation type="unfinished">luola</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>altitude</source>
         <translation type="unfinished">korkeus</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>pool</source>
         <translation type="unfinished">uima-allas</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>lake</source>
         <translation type="unfinished">järvi</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="16"/>
         <source>river</source>
         <translation type="unfinished">joki</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="17"/>
         <source>night</source>
         <translation type="unfinished">yö</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="17"/>
+        <source>fresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="17"/>
+        <source>student</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>freshwater</source>
-        <translation type="unfinished">makea vesi</translation>
+        <translation type="obsolete">makea vesi</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
         <source>training</source>
-        <translation type="unfinished">harjoittelu</translation>
+        <translation type="obsolete">harjoittelu</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
         <source>teaching</source>
-        <translation type="unfinished">opetus</translation>
+        <translation type="obsolete">opetus</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
         <source>photo</source>
         <translation type="unfinished">valokuva</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
         <source>video</source>
         <translation type="unfinished">video</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
+        <source>instructor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="19"/>
         <source>deco</source>
         <translation type="unfinished">deko</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="199"/>
+        <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
         <translation type="unfinished">yli %d päivää</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="205"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation type="unfinished">%d pv %d t %d min</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="207"/>
+        <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
         <translation type="unfinished">%d t %d min</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="218"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation type="unfinished">sukellukselle numero </translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="225"/>
+        <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
         <translation type="unfinished">valitut sukellukset</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="260"/>
+        <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
         <translation type="unfinished">Sukellus #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="262"/>
+        <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
         <translation type="unfinished">valittu sukellus</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="264"/>
+        <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
         <translation type="unfinished">kaikille sukelluksille</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="266"/>
+        <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
         <translation type="unfinished">(ei sukelluksia)</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="363"/>
-        <source>, EAN%d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
         <translation type="unfinished">su</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
         <translation type="unfinished">ma</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
         <translation type="unfinished">ti</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
         <translation type="unfinished">ke</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
         <translation type="unfinished">to</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
         <translation type="unfinished">pe</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
         <translation type="unfinished">la</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
         <translation type="unfinished">tammi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
         <translation type="unfinished">helmi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
         <translation type="unfinished">maalis</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
         <translation type="unfinished">huhti</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
         <translation type="unfinished">touko</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
         <translation type="unfinished">kesä</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
         <translation type="unfinished">heinä</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
         <translation type="unfinished">elo</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
         <translation type="unfinished">syys</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
         <translation type="unfinished">loka</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
         <translation type="unfinished">marras</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
         <translation type="unfinished">joulu</translation>
     </message>
diff --git a/translations/subsurface_fr_FR.ts b/translations/subsurface_fr_FR.ts
index 1dfb73c54..61a295281 100644
--- a/translations/subsurface_fr_FR.ts
+++ b/translations/subsurface_fr_FR.ts
@@ -2318,42 +2318,135 @@ Sylvestre Ledru</translation>
     </message>
 </context>
 <context>
+    <name>CSVImportDialog</name>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <source>Import File (CSV)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <source>Field Separator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <source>Field Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <source>Time</source>
+        <translation type="unfinished">Temps</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <source>Depth</source>
+        <translation type="unfinished">Profondeur</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <source>Temp</source>
+        <translation type="unfinished">Temp.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
+        <source>Po2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <source>Cns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <source>Stopdepth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <source>Pre-configured imports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>Open CSV Log File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>CSV Files (*.csv)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
         <translation type="unfinished">Type</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
         <translation type="unfinished">Taille</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="65"/>
+        <source>Switch at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="163"/>
+        <source>Clicking here will remove this cylinder.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="385"/>
+        <source>Cylinder cannot be removed</source>
+        <translation type="unfinished"></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>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
@@ -2377,30 +2470,35 @@ Sylvestre Ledru</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Device ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Model</source>
         <translation type="unfinished">Modèle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
         <translation type="unfinished">Surnom</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <source>Clicking here will remove this divecomputer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1009"/>
+        <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1011"/>
+        <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2408,186 +2506,206 @@ Sylvestre Ledru</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="39"/>
+        <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="398"/>
+        <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="399"/>
+        <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="400"/>
-        <source>collapse</source>
+        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <source>collapse others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="402"/>
-        <source>remove dive from trip</source>
+        <location filename="../qt-ui/divelistview.cpp" line="638"/>
+        <source>remove dive(s) from trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="405"/>
-        <source>Merge trip with trip above</source>
-        <translation type="unfinished">Fusionner le groupe avec le groupe au dessus</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="639"/>
+        <source>create new trip above</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="406"/>
-        <source>Merge trip with trip below</source>
-        <translation type="unfinished">Fusionner le groupe avec le groupe en dessous</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="640"/>
+        <source>add dive(s) to trip immideately above</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="410"/>
-        <source>delete dive</source>
+        <location filename="../qt-ui/divelistview.cpp" line="643"/>
+        <source>merge trip with trip above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="412"/>
-        <source>merge selected dives</source>
+        <location filename="../qt-ui/divelistview.cpp" line="644"/>
+        <source>merge trip with trip below</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../qt-ui/divelistview.cpp" line="648"/>
+        <source>delete dive(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
-        <source>Bottom SAC</source>
+        <location filename="../qt-ui/divelistview.cpp" line="652"/>
+        <source>save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
-        <source>High GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="653"/>
+        <source>export As UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
-        <source>SAC on DECO Stop</source>
+        <location filename="../qt-ui/divelistview.cpp" line="654"/>
+        <source>shift times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
-        <source>Low GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
+        <source>Save Dives As...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="114"/>
-        <source>Last Stop at 6m</source>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
+        <source>Save File as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="141"/>
-        <source>Start Time</source>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="148"/>
-        <source>ATM Pressure</source>
+        <source>Merge trip with trip above</source>
+        <translation type="obsolete">Fusionner le groupe avec le groupe au dessus</translation>
+    </message>
+    <message>
+        <source>Merge trip with trip below</source>
+        <translation type="obsolete">Fusionner le groupe avec le groupe en dessous</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <source>merge selected dives</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DivePlannerGraphics</name>
+    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="143"/>
-        <source>10m</source>
+        <location filename="../qt-ui/diveplanner.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="145"/>
-        <source>30ft</source>
+        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <source>Bottom SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="146"/>
-        <source>Increase maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <source>SAC on DECO Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="147"/>
-        <source>Decreases maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <source>Increase minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>10min</source>
+        <location filename="../qt-ui/diveplanner.ui" line="108"/>
+        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>Decreases minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <source>Last Stop at 6m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
-        <source>Handler Position Error</source>
+        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="386"/>
-        <source>One or more of your stops will be lost with this operations, 
-Please, remove them first.</source>
+        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <source>ATM Pressure</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DivePlannerGraphics</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <source>10m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="136"/>
+        <source>30ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <source>Handler Position Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="415"/>
-        <source>Air</source>
+        <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>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="420"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="421"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="424"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="425"/>
-        <source>Air</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <source>AIR</source>
+        <translation type="unfinished">AIR</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="986"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="987"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
         <translation type="unfinished">Durée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="988"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="989"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1141"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1142"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2595,75 +2713,85 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="851"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="937"/>
+        <source>Available Gases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <source>add dive data point</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1051"/>
+        <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
         <translation type="unfinished">N°</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1052"/>
+        <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
         <translation type="unfinished">Date</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
         <translation type="unfinished">m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
         <translation type="unfinished">pied</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1055"/>
+        <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
         <translation type="unfinished">min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
         <translation type="unfinished">livre US</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1058"/>
+        <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
         <translation type="unfinished">Combinaison</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1059"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
         <translation type="unfinished">Blk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1061"/>
+        <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
         <translation type="unfinished">Consommation d&apos;air</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1062"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1063"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
         <translation type="unfinished">SNCmax</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1064"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
         <translation type="unfinished">Lieu</translation>
     </message>
@@ -2671,14 +2799,20 @@ Please, remove them first.</source>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="138"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
         <translation type="unfinished">Erreur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="142"/>
-        <source>retry</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
+        <source>Retry</source>
+        <translation type="unfinished">Essayer à nouveau</translation>
     </message>
 </context>
 <context>
@@ -2738,6 +2872,7 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
         <translation type="unfinished">Notes de plongée</translation>
     </message>
@@ -2752,225 +2887,238 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <source>M/d/yy h:mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="108"/>
-        <location filename="../qt-ui/maintab.cpp" line="307"/>
+        <location filename="../qt-ui/maintab.ui" line="112"/>
+        <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
         <translation type="unfinished">Lieu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="122"/>
+        <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="136"/>
+        <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
         <translation type="unfinished">Chef de palanquée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="143"/>
+        <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
         <translation type="unfinished">Binôme</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="166"/>
+        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
         <translation type="unfinished">Évaluation</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="173"/>
+        <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
         <translation type="unfinished">Visibilité</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="182"/>
+        <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
         <translation type="unfinished">Combinaison</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="206"/>
-        <location filename="../qt-ui/maintab.cpp" line="308"/>
+        <location filename="../qt-ui/maintab.ui" line="217"/>
+        <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
         <translation type="unfinished">Notes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="232"/>
+        <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
         <translation type="unfinished">Équipement</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="319"/>
+        <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
         <translation type="unfinished">Détails de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="361"/>
+        <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
         <translation type="unfinished">Date</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="380"/>
+        <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="399"/>
+        <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="418"/>
+        <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="437"/>
-        <location filename="../qt-ui/maintab.ui" line="692"/>
+        <location filename="../qt-ui/maintab.ui" line="466"/>
+        <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
         <translation type="unfinished">Consommation d&apos;air</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="456"/>
+        <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="475"/>
+        <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="494"/>
+        <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="513"/>
+        <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="532"/>
+        <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="551"/>
+        <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="570"/>
+        <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
         <translation type="unfinished">Temps de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="589"/>
+        <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
         <translation type="unfinished">Stats</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="668"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation type="unfinished">Profondeur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="680"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation type="unfinished">Température</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="704"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation type="unfinished">Durée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="716"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation type="unfinished">Temps total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="735"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation type="unfinished">Plongées</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="68"/>
+        <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
         <translation type="unfinished">Blocs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="129"/>
-        <location filename="../qt-ui/maintab.cpp" line="131"/>
-        <source>This trip is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <source>Trip Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="137"/>
-        <location filename="../qt-ui/maintab.cpp" line="139"/>
-        <source>This dive is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="296"/>
+        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <source>Trip Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="286"/>
-        <source>Trip Location</source>
+        <location filename="../qt-ui/maintab.cpp" line="134"/>
+        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="288"/>
-        <source>Trip Notes</source>
+        <location filename="../qt-ui/maintab.cpp" line="143"/>
+        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
-        <location filename="../qt-ui/maintab.cpp" line="337"/>
-        <location filename="../qt-ui/maintab.cpp" line="338"/>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="146"/>
+        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <source>This dive is being edited. Select Save or Cancel when done.</source>
+        <translation type="unfinished"></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"/>
         <source>/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <source>unknown</source>
+        <translation type="unfinished">inconnu</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
         <translation type="unfinished">N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
         <translation type="unfinished">S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
         <translation type="unfinished">E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
         <translation type="unfinished">O</translation>
     </message>
@@ -2983,308 +3131,432 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="177"/>
         <source>File</source>
-        <translation type="unfinished">Fichier</translation>
+        <translation type="obsolete">Fichier</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="196"/>
         <source>Log</source>
-        <translation type="unfinished">Journal</translation>
+        <translation type="obsolete">Journal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="211"/>
         <source>View</source>
-        <translation type="unfinished">Vue</translation>
+        <translation type="obsolete">Vue</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="226"/>
+        <location filename="../qt-ui/mainwindow.ui" line="218"/>
         <source>Filter</source>
         <translation type="unfinished">Filtrer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="232"/>
         <source>Help</source>
-        <translation type="unfinished">Aide</translation>
+        <translation type="obsolete">Aide</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="245"/>
+        <location filename="../qt-ui/mainwindow.ui" line="177"/>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <source>&amp;Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <source>&amp;View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <source>&amp;Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>&amp;New logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
         <translation type="unfinished">Nouveau</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <source>&amp;Open logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="256"/>
+        <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
+        <location filename="../qt-ui/mainwindow.ui" line="281"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation type="unfinished">Enregistrer sous</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
+        <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="277"/>
+        <location filename="../qt-ui/mainwindow.ui" line="292"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation type="unfinished">Fermer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="285"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="176"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <source>Export UDDF</source>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <source>Export &amp;UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
-        <source>Print</source>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <source>Ctrl+U</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="301"/>
-        <source>Ctrl+P</source>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <source>&amp;Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
-        <source>Preferences</source>
-        <translation type="unfinished">Préférences</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <source>Ctrl+,</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="311"/>
-        <source>Quit</source>
-        <translation type="unfinished">Quitter</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
-        <source>Ctrl+Q</source>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <source>Import from &amp;dive computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <source>Download from Dive computer</source>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
-        <source>Ctrl+D</source>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <source>Ctrl+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="327"/>
-        <source>Download from Web Service</source>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <source>&amp;Edit Device Names</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="332"/>
-        <source>Edit Device Names</source>
-        <translation type="unfinished">Modifier le nom du périphérique</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <source>Ctrl++</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="337"/>
-        <source>Add Dive</source>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <source>&amp;Renumber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
-        <source>Renumber</source>
-        <translation type="unfinished">Renuméroter</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Ctrl+R</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
-        <source>Auto Group</source>
+        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <source>Toggle &amp;Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
-        <source>Toggle Zoom</source>
-        <translation type="unfinished">Changer de zoom</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <source>&amp;Yearly Statistics</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
-        <source>Yearly Statistics</source>
-        <translation type="unfinished">Statistiques annuelles</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <source>Ctrl+Y</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
-        <source>View List</source>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Dive List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="365"/>
-        <source>Ctrl+2</source>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <source>Profile</source>
+        <translation type="unfinished">Profil</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <source>Info</source>
+        <translation type="unfinished">Informations</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
-        <source>View Profile</source>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <source>User &amp;Manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="373"/>
-        <source>Ctrl+3</source>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <source>Globe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
-        <source>View Info</source>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <source>P&amp;lan Dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="381"/>
-        <source>Ctrl+4</source>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <source>Ctrl+L</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <source>Import CSV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <source>Import CS&amp;V</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <source>Import from Divelogs.de</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <source>Preferences</source>
+        <translation type="unfinished">Préférences</translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="obsolete">Quitter</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <source>Ctrl+D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Device Names</source>
+        <translation type="obsolete">Modifier le nom du périphérique</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <source>Add Dive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Renumber</source>
+        <translation type="obsolete">Renuméroter</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/mainwindow.ui" line="386"/>
-        <source>View All</source>
+        <source>Auto Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="389"/>
+        <source>Toggle Zoom</source>
+        <translation type="obsolete">Changer de zoom</translation>
+    </message>
+    <message>
+        <source>Yearly Statistics</source>
+        <translation type="obsolete">Statistiques annuelles</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <source>Ctrl+2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <source>Ctrl+3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <source>Ctrl+4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>Ctrl+1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Prev DC</source>
         <translation type="unfinished">Ordinateur précédent</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
+        <location filename="../qt-ui/mainwindow.ui" line="439"/>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="402"/>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Next DC</source>
         <translation type="unfinished">Ordinateur suivant</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="405"/>
+        <location filename="../qt-ui/mainwindow.ui" line="447"/>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="410"/>
+        <location filename="../qt-ui/mainwindow.ui" line="452"/>
         <source>Select Events</source>
         <translation type="unfinished">Sélection des événements</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
         <source>Input Plan</source>
         <translation type="unfinished">Saisir le plan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
         <source>About Subsurface</source>
         <translation type="unfinished">À propos de Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>User Manual</source>
-        <translation type="unfinished">Manuel utilisateur</translation>
+        <translation type="obsolete">Manuel utilisateur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>F1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="433"/>
-        <source>View Globe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="478"/>
         <source>Ctrl+5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="441"/>
-        <source>Dive Planner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="108"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Open File</source>
         <translation type="unfinished">Ouvrir un Fichier</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="271"/>
-        <source>manually added dive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="448"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="450"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="455"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
         <translation type="unfinished">Enregistrement des changements ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="456"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="695"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="696"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="144"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="250"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="286"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="197"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3347,215 +3619,235 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="218"/>
+        <location filename="../qt-ui/preferences.ui" line="199"/>
+        <source>Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="205"/>
+        <source>Use Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="225"/>
+        <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="235"/>
+        <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="245"/>
+        <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="269"/>
+        <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
         <translation type="unfinished">Profondeur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="276"/>
+        <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
         <translation type="unfinished">Mètre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="286"/>
+        <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
         <translation type="unfinished">Pieds</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
         <translation type="unfinished">Pression</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="303"/>
+        <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
         <translation type="unfinished">bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="313"/>
+        <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="330"/>
+        <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
         <translation type="unfinished">Litre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="340"/>
+        <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
         <translation type="unfinished">Pieds³</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="350"/>
+        <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
         <translation type="unfinished">Température</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="357"/>
+        <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
         <translation type="unfinished">Celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
         <translation type="unfinished">Fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="377"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
         <translation type="unfinished">Poids</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
         <translation type="unfinished">livre US</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="464"/>
+        <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="472"/>
+        <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="495"/>
-        <location filename="../qt-ui/preferences.ui" line="536"/>
-        <location filename="../qt-ui/preferences.ui" line="577"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="513"/>
+        <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="554"/>
+        <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="595"/>
+        <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="618"/>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="634"/>
+        <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="643"/>
+        <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="666"/>
+        <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="677"/>
+        <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="700"/>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="710"/>
+        <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="721"/>
-        <source>Show time</source>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
+        <source>Calculate NDL/TTS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="733"/>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>Show SAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
+        <source>GFLow at max depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="739"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
-        <source>XML Files (*.xml)</source>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3693,51 +3985,86 @@ Please, remove them first.</source>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="257"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="259"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <source>Hide events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <source>Hide all %1 events?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <source>Remove the selected event?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <source>%1 @ %2:%3</source>
+        <translation type="unfinished"></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>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="337"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="383"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="384"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="582"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="850"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <source>Measure properties of dive segments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
+        <source>Scale your dive to screen size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
+        <source>Edit</source>
+        <translation type="unfinished">Modifier</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
         <translation type="unfinished">air</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="584"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="851"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="859"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
         <translation type="unfinished">Passer en CO</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="861"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished"> début</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="862"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished"> fin</translation>
@@ -3746,62 +4073,62 @@ Please, remove them first.</source>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1497"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
         <translation type="unfinished">inconnu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1502"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1505"/>
+        <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1512"/>
+        <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1517"/>
+        <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
         <translation type="unfinished">Bloc</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1519"/>
+        <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
         <translation type="unfinished">Mélange gazeux</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1547"/>
+        <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
         <translation type="unfinished">Consommation d&apos;air</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1549"/>
+        <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
         <translation type="unfinished">SNC Max.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1551"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1564"/>
+        <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1570"/>
+        <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3810,30 +4137,30 @@ Please, remove them first.</source>
     <name>QObject</name>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="44"/>
         <source>AIR</source>
         <translation type="unfinished">AIR</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="38"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="45"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="723"/>
+        <source>Remove this Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>EAN32</source>
-        <translation type="unfinished">Nitrox32</translation>
+        <translation type="obsolete">Nitrox32</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="46"/>
         <source>EAN36</source>
-        <translation type="unfinished">Nitrox36</translation>
+        <translation type="obsolete">Nitrox36</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="47"/>
-        <source>Choose Gas</source>
+        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <source>No location data - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="188"/>
-        <source>No location data - move the map and double-click to set the dive location</source>
+        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3842,17 +4169,17 @@ Please, remove them first.</source>
         <translation type="unfinished">Fermer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="26"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation type="unfinished">Moyenne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="29"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation type="unfinished">Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation type="unfinished">Maximum</translation>
     </message>
@@ -3871,92 +4198,95 @@ Please, remove them first.</source>
     </message>
 </context>
 <context>
-    <name>SubsurfaceAbout</name>
+    <name>ShiftTimesDialog</name>
     <message>
-        <location filename="../qt-ui/about.ui" line="23"/>
-        <source>About Subsurface</source>
-        <translation type="unfinished">À propos de Subsurface</translation>
+        <location filename="../qt-ui/shifttimes.ui" line="14"/>
+        <source>Shift selected times</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
+        <location filename="../qt-ui/shifttimes.ui" line="35"/>
+        <source>Shift times of selected dives by</source>
         <translation type="unfinished"></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>
+        <location filename="../qt-ui/shifttimes.ui" line="80"/>
+        <source>h:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="22"/>
-        <source>&amp;License</source>
+        <location filename="../qt-ui/shifttimes.ui" line="90"/>
+        <source>earlier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
-        <source>&amp;Website</source>
+        <location filename="../qt-ui/shifttimes.ui" line="97"/>
+        <source>later</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SubsurfaceWebServices</name>
+    <name>SubsurfaceAbout</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="14"/>
-        <source>Download Location Data</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/about.ui" line="23"/>
+        <source>About Subsurface</source>
+        <translation type="unfinished">À propos de Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="37"/>
-        <source>Download</source>
+        <location filename="../qt-ui/about.ui" line="64"/>
+        <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="44"/>
-        <source>Enter your ID here</source>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="51"/>
-        <source>User ID</source>
+        <location filename="../qt-ui/about.cpp" line="22"/>
+        <source>&amp;License</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="58"/>
-        <source>Status:</source>
+        <location filename="../qt-ui/about.cpp" line="23"/>
+        <source>&amp;Website</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="49"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
         <translation type="unfinished">Serveur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="90"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="106"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="130"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
         <translation type="unfinished">Erreur de connexion : </translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
         <translation type="unfinished">Identifiant utilisateur incorrect.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
         <translation type="unfinished">Impossible de lire la réponse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="133"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
         <translation type="unfinished">Téléchargement réussi</translation>
     </message>
@@ -3977,17 +4307,17 @@ Please, remove them first.</source>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Bar</source>
         <translation type="unfinished">bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3995,7 +4325,7 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1393"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4003,96 +4333,139 @@ Please, remove them first.</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>WebServices</name>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="14"/>
+        <source>Download Location Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="20"/>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="27"/>
+        <source>Enter your ID here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="34"/>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="58"/>
+        <source>User ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="72"/>
+        <source>Password</source>
+        <translation type="unfinished">Mot de passe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="86"/>
+        <source>Upload</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
         <translation type="unfinished">Type</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
         <translation type="unfinished">Poids</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="460"/>
+        <source>Clicking here will remove this weigthsystem.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
- &gt; Month</source>
+ &gt; Month / Trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
         <translation type="unfinished">N°</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1307"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1310"/>
+        <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1311"/>
+        <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1312"/>
-        <location filename="../qt-ui/models.cpp" line="1315"/>
-        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <location filename="../qt-ui/models.cpp" line="1418"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1313"/>
-        <location filename="../qt-ui/models.cpp" line="1316"/>
-        <location filename="../qt-ui/models.cpp" line="1319"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"></translation>
@@ -4101,91 +4474,74 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="44"/>
+        <location filename="../dive.c" line="57"/>
         <source>pascal</source>
         <translation type="unfinished">pascal</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="48"/>
-        <location filename="../qt-gui.cpp" line="323"/>
+        <location filename="../dive.c" line="61"/>
+        <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
         <translation type="unfinished">bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="52"/>
-        <location filename="../qt-gui.cpp" line="326"/>
+        <location filename="../dive.c" line="65"/>
+        <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
         <translation type="unfinished">psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="88"/>
-        <location filename="../qt-gui.cpp" line="304"/>
+        <location filename="../dive.c" line="101"/>
+        <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
         <translation type="unfinished">l</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="93"/>
-        <location filename="../qt-gui.cpp" line="307"/>
+        <location filename="../dive.c" line="106"/>
+        <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
         <translation type="unfinished">pied³</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="121"/>
-        <location filename="../qt-gui.cpp" line="207"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
         <translation type="unfinished">m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="126"/>
-        <location filename="../qt-gui.cpp" line="210"/>
+        <location filename="../dive.c" line="139"/>
+        <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
         <translation type="unfinished">pied</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="170"/>
-        <location filename="../qt-gui.cpp" line="233"/>
+        <location filename="../dive.c" line="183"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
         <translation type="unfinished">livre US</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
-        <location filename="../qt-gui.cpp" line="231"/>
+        <location filename="../dive.c" line="187"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="966"/>
+        <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
         <translation type="unfinished">(%s) ou (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="473"/>
         <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <translation type="unfinished">%1$s %3$d %2$s %4$d, %5$02d:%6$02d</translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="490"/>
-        <source>%1$s %2$d, %3$d
-%4$02d:%5$02d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="512"/>
-        <source>%1$s %2$d (%3$d dives)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="519"/>
-        <source>%1$s %2$d (1 dive)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">%1$s %3$d %2$s %4$d, %5$02d:%6$02d</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="550"/>
-        <location filename="../planner.c" line="94"/>
-        <location filename="../planner.c" line="748"/>
-        <location filename="../planner.c" line="749"/>
-        <location filename="../statistics.c" line="360"/>
-        <location filename="../statistics.c" line="371"/>
+        <location filename="../divelist.c" line="488"/>
+        <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"/>
         <source>air</source>
         <translation type="unfinished">air</translation>
     </message>
@@ -4215,312 +4571,324 @@ Maximum</source>
         <translation type="unfinished">clip-on</translation>
     </message>
     <message>
-        <location filename="../file.c" line="106"/>
-        <location filename="../file.c" line="108"/>
-        <location filename="../file.c" line="303"/>
-        <location filename="../file.c" line="305"/>
+        <location filename="../file.c" line="107"/>
+        <location filename="../file.c" line="109"/>
+        <location filename="../file.c" line="308"/>
+        <location filename="../file.c" line="310"/>
+        <location filename="../file.c" line="390"/>
+        <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation type="unfinished">Impossible de la lecture « %s »</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <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>
+    </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>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
         <translation type="unfinished">aucun</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
         <translation type="unfinished">Arrêt de décompression</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
         <translation type="unfinished">rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
         <translation type="unfinished">ascension</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
         <translation type="unfinished">plafond</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
         <translation type="unfinished">charge</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
         <translation type="unfinished">transmetteur</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
         <translation type="unfinished">violation</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
         <translation type="unfinished">marque-page</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
         <translation type="unfinished">surface</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
         <translation type="unfinished">palier de sécurité</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
         <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
         <translation type="unfinished">Changement de gas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
         <translation type="unfinished">palier de sécurité (volontaire)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
         <translation type="unfinished">palier de sécurité (obligatoire)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
         <translation type="unfinished">Arrêt profond</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
         <translation type="unfinished">plafond (palier de sécurité)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
         <translation type="unfinished">Temps de plongée</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
         <translation type="unfinished">profondeur max</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
         <translation type="unfinished">OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
         <translation type="unfinished">PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
         <translation type="unfinished">temps d&apos;air</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
         <translation type="unfinished">rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
         <translation type="unfinished">entête</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
         <translation type="unfinished">Avertissement de niveau « tissue »</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
         <translation type="unfinished">temps sans arrêt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="157"/>
+        <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
         <translation type="unfinished">numéro d&apos;événement non valide</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="390"/>
+        <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
         <translation type="unfinished">Impossible de créer une analyse pour %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="396"/>
+        <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
         <translation type="unfinished">Impossible d&apos;enregistrer les données</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="405"/>
+        <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
         <translation type="unfinished">Impossible d&apos;analyser l&apos;heure</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
         <translation type="unfinished">Plongée n°%d - %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="427"/>
+        <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
         <translation type="unfinished">Impossible d&apos;analyser le temps de plongée</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="437"/>
+        <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
         <translation type="unfinished">Impossible d&apos;analyser la profondeux maximale</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="447"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
         <translation type="unfinished">Impossible d&apos;analyser le nombre de mélange gazeux</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
         <translation type="unfinished">Impossible d&apos;obtenir la salinité de l&apos;eau</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="469"/>
+        <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
         <translation type="unfinished">Impossible d&apos;analyser le mélange gazeux</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
         <translation type="unfinished">Impossible d&apos;analyser des échantillons</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="613"/>
+        <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
         <translation type="unfinished">Événement : attente d&apos;une action de l&apos;utilisateur</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="621"/>
+        <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation type="unfinished">modèle = %u (0x%08x), firmware = %u (0x%08x), port série = %u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="663"/>
+        <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
         <translation type="unfinished">Impossible d&apos;enregistrer le gestionnaire d&apos;événement.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="668"/>
+        <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished">Impossible d&apos;enregistrer le gestionnaire d&apos;annulation.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="672"/>
+        <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
         <translation type="unfinished">Erreur à l&apos;import des données de plongées</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="690"/>
+        <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished">Impossible de créer un contexte libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished">Impossible d&apos;ouvrir %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="549"/>
+        <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
         <translation type="unfinished">Valeur de pourcentage étrange %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1695"/>
+        <location filename="../parse-xml.c" line="1717"/>
         <source>Failed to parse &apos;%s&apos;.
 </source>
         <translation type="unfinished">Impossible d&apos;analyser « %s ».
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1696"/>
+        <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation type="unfinished">Impossible d&apos;analyser « %s »</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1894"/>
+        <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
         <translation type="unfinished">Échec de la requête.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1929"/>
+        <location filename="../parse-xml.c" line="1951"/>
         <source>Database connection failed &apos;%s&apos;.
 </source>
         <translation type="unfinished">Connexion à la base de données impossible &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1936"/>
+        <location filename="../parse-xml.c" line="1958"/>
         <source>Database query failed &apos;%s&apos;.
 </source>
         <translation type="unfinished">Échec de la requête &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2048"/>
+        <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
         <translation type="unfinished">Impossible d&apos;ouvrir la feuille de style (%s)/%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="96"/>
-        <location filename="../statistics.c" line="363"/>
+        <location filename="../planner.c" line="98"/>
+        <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
         <translation type="unfinished">Nitrox%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="131"/>
+        <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation type="unfinished">Impossible de trouver le gaz %d/%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="192"/>
         <source>Cylinder for planning</source>
-        <translation type="unfinished">Bloc pour la simulation</translation>
+        <translation type="obsolete">Bloc pour la simulation</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="217"/>
         <source>Simulated Dive</source>
-        <translation type="unfinished">Plongée simulée</translation>
+        <translation type="obsolete">Plongée simulée</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="294"/>
+        <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
         <translation type="unfinished">Trop de gaz différents</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="472"/>
+        <location filename="../planner.c" line="493"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -4533,180 +4901,173 @@ basé sur un GFlow = %.0f et un GFhigh = %.0f
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="513"/>
+        <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished">Transition vers %.*f %s en %d:%02d min - temps %d:%02u sur %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="522"/>
+        <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished">Rester à %.*f %s pour %d:%02d min - temps %d:%02u sur %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
         <translation type="unfinished">Changer pour du gaz %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
         <translation type="unfinished">Consommation de gaz :
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="552"/>
+        <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
         <translation type="unfinished">%.0f%s de %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="776"/>
         <source>ean</source>
         <translation type="unfinished">ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1154"/>
         <source>D:%.1f %s</source>
-        <translation type="unfinished">P : %.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1158"/>
-        <source>%s
-T:%d:%02d</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">P : %.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
         <translation type="unfinished">%s
 P : %d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
         <translation type="unfinished">%s
 T : %.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1177"/>
+        <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation type="unfinished">%s
 Plafond calculé %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1189"/>
+        <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation type="unfinished">%s
 Arrêt de sécurité : %umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1199"/>
+        <source>@:%d:%02d
+D:%.1f %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1219"/>
+        <source>%s
+SAC:%2.1fl/min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation type="unfinished">%s
 Arrêt de sécurité : durée inconnue @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation type="unfinished">%s
 Décompression : %umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1211"/>
+        <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation type="unfinished">%s
 Décompression : durée inconnue @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1217"/>
+        <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
         <translation type="unfinished">%s
 En décompression</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
-        <source>%s
-NDL:-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1275"/>
         <source>%s
 NDL:%umin</source>
         <translation type="unfinished">%s
 NDL : %umin</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
-        <source>%s
-TTS:%umin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1223"/>
         <source>%s
 CNS:%u%%</source>
         <translation type="unfinished">%s
 SNC : %u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1227"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation type="unfinished">%s
 pO%s : %.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1231"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation type="unfinished">%s
 pN%s : %.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1243"/>
+        <location filename="../profile.c" line="1235"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation type="unfinished">%s
 pHe : %.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1240"/>
         <source>%s
 MOD:%d%s</source>
         <translation type="unfinished">%s
 MOD : %d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1247"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -4717,295 +5078,346 @@ END : %d%s
 EADD : %d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1349"/>
+        <location filename="../profile.c" line="1280"/>
+        <source>%s
+Deco:%umin @ %.0f %s (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1289"/>
+        <source>%s
+In deco (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>%s
+NDL:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1296"/>
+        <source>%s
+TTS:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
-        <location filename="../profile.c" line="1357"/>
+        <location filename="../profile.c" line="1409"/>
+        <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1361"/>
+        <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1365"/>
+        <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1369"/>
-        <source>%s%sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1425"/>
+        <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1373"/>
-        <location filename="../profile.c" line="1377"/>
-        <source>%s %sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1429"/>
+        <location filename="../profile.c" line="1433"/>
+        <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1384"/>
+        <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="284"/>
+        <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="288"/>
+        <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../qt-gui.cpp" line="460"/>
+        <source>%1, %2 %3, %4 %5:%6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="473"/>
+        <source>%1 %2, %3
+%4:%5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="486"/>
+        <source>%1 %2 (%3 dives)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="491"/>
+        <source>%1 %2 (1 dive)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>invalid</source>
-        <translation type="unfinished">Invalide</translation>
+        <translation type="obsolete">Invalide</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>boat</source>
         <translation type="unfinished">bateau</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>shore</source>
         <translation type="unfinished">rivage</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>drift</source>
         <translation type="unfinished">dérivante</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>deep</source>
         <translation type="unfinished">profondeur</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>cavern</source>
         <translation type="unfinished">grotte</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="14"/>
         <source>ice</source>
         <translation type="unfinished">glace</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>wreck</source>
         <translation type="unfinished">épave</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>cave</source>
         <translation type="unfinished">grotte</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>altitude</source>
         <translation type="unfinished">altitude</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>pool</source>
         <translation type="unfinished">piscine</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>lake</source>
         <translation type="unfinished">Lac</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="16"/>
         <source>river</source>
         <translation type="unfinished">rivière</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="17"/>
         <source>night</source>
         <translation type="unfinished">nuit</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="17"/>
+        <source>fresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="17"/>
+        <source>student</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>freshwater</source>
-        <translation type="unfinished">eau douce</translation>
+        <translation type="obsolete">eau douce</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
         <source>training</source>
-        <translation type="unfinished">entraînement</translation>
+        <translation type="obsolete">entraînement</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
         <source>teaching</source>
-        <translation type="unfinished">technique</translation>
+        <translation type="obsolete">technique</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
         <source>photo</source>
         <translation type="unfinished">photo</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
         <source>video</source>
         <translation type="unfinished">vidéo</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
+        <source>instructor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="19"/>
         <source>deco</source>
         <translation type="unfinished">décompression</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="199"/>
+        <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
         <translation type="unfinished">plus de %d jours</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="205"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation type="unfinished">%d j %d h %d min</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="207"/>
+        <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
         <translation type="unfinished">%d h %d min</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="218"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation type="unfinished">pour les plongées n°</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="225"/>
+        <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
         <translation type="unfinished">uniquement les plongées sélectionnées</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="260"/>
+        <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
         <translation type="unfinished">pour la plongée n°%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="262"/>
+        <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
         <translation type="unfinished">uniquement la plongée sélectionnée</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="264"/>
+        <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
         <translation type="unfinished">pour toutes les plongées</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="266"/>
+        <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
         <translation type="unfinished">(pas de plongées)</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="363"/>
-        <source>, EAN%d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
         <translation type="unfinished">Dim.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
         <translation type="unfinished">Lun.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
         <translation type="unfinished">Mar.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
         <translation type="unfinished">Mer.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
         <translation type="unfinished">Jeu.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
         <translation type="unfinished">Ven.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
         <translation type="unfinished">Sam.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
         <translation type="unfinished">Janv.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
         <translation type="unfinished">Fév.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
         <translation type="unfinished">Mar.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
         <translation type="unfinished">Avril</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
         <translation type="unfinished">Mai</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
         <translation type="unfinished">Juin</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
         <translation type="unfinished">Juil.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
         <translation type="unfinished">Août</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
         <translation type="unfinished">Sept.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
         <translation type="unfinished">Oct.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
         <translation type="unfinished">Nov.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
         <translation type="unfinished">Déc.</translation>
     </message>
diff --git a/translations/subsurface_hr_HR.ts b/translations/subsurface_hr_HR.ts
index 725f97434..f06e824c4 100644
--- a/translations/subsurface_hr_HR.ts
+++ b/translations/subsurface_hr_HR.ts
@@ -2298,42 +2298,135 @@ tranlators here
     </message>
 </context>
 <context>
+    <name>CSVImportDialog</name>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <source>Import File (CSV)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <source>Field Separator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <source>Field Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <source>Time</source>
+        <translation type="unfinished">Vrijeme</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <source>Depth</source>
+        <translation type="unfinished">Dubina</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <source>Temp</source>
+        <translation type="unfinished">Temp</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
+        <source>Po2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <source>Cns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <source>Stopdepth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <source>Pre-configured imports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>Open CSV Log File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>CSV Files (*.csv)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
         <translation type="unfinished">Vrsta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
         <translation type="unfinished">Veličina</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="65"/>
+        <source>Switch at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="163"/>
+        <source>Clicking here will remove this cylinder.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="385"/>
+        <source>Cylinder cannot be removed</source>
+        <translation type="unfinished"></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>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
@@ -2357,30 +2450,35 @@ tranlators here
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Device ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Model</source>
         <translation type="unfinished">Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
         <translation type="unfinished">Naziv uređaja</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <source>Clicking here will remove this divecomputer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1009"/>
+        <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1011"/>
+        <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2388,186 +2486,206 @@ tranlators here
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="39"/>
+        <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="398"/>
+        <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="399"/>
+        <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="400"/>
-        <source>collapse</source>
+        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <source>collapse others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="402"/>
-        <source>remove dive from trip</source>
+        <location filename="../qt-ui/divelistview.cpp" line="638"/>
+        <source>remove dive(s) from trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="405"/>
-        <source>Merge trip with trip above</source>
-        <translation type="unfinished">Spoji s grupom iznad</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="639"/>
+        <source>create new trip above</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="406"/>
-        <source>Merge trip with trip below</source>
-        <translation type="unfinished">Spoji s grupom ispod</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="640"/>
+        <source>add dive(s) to trip immideately above</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="410"/>
-        <source>delete dive</source>
+        <location filename="../qt-ui/divelistview.cpp" line="643"/>
+        <source>merge trip with trip above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="412"/>
-        <source>merge selected dives</source>
+        <location filename="../qt-ui/divelistview.cpp" line="644"/>
+        <source>merge trip with trip below</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../qt-ui/divelistview.cpp" line="648"/>
+        <source>delete dive(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
-        <source>Bottom SAC</source>
+        <location filename="../qt-ui/divelistview.cpp" line="652"/>
+        <source>save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
-        <source>High GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="653"/>
+        <source>export As UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
-        <source>SAC on DECO Stop</source>
+        <location filename="../qt-ui/divelistview.cpp" line="654"/>
+        <source>shift times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
-        <source>Low GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
+        <source>Save Dives As...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="114"/>
-        <source>Last Stop at 6m</source>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
+        <source>Save File as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="141"/>
-        <source>Start Time</source>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="148"/>
-        <source>ATM Pressure</source>
+        <source>Merge trip with trip above</source>
+        <translation type="obsolete">Spoji s grupom iznad</translation>
+    </message>
+    <message>
+        <source>Merge trip with trip below</source>
+        <translation type="obsolete">Spoji s grupom ispod</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <source>merge selected dives</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DivePlannerGraphics</name>
+    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="143"/>
-        <source>10m</source>
+        <location filename="../qt-ui/diveplanner.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="145"/>
-        <source>30ft</source>
+        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <source>Bottom SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="146"/>
-        <source>Increase maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <source>SAC on DECO Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="147"/>
-        <source>Decreases maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <source>Increase minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>10min</source>
+        <location filename="../qt-ui/diveplanner.ui" line="108"/>
+        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>Decreases minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <source>Last Stop at 6m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
-        <source>Handler Position Error</source>
+        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="386"/>
-        <source>One or more of your stops will be lost with this operations, 
-Please, remove them first.</source>
+        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <source>ATM Pressure</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DivePlannerGraphics</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <source>10m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="136"/>
+        <source>30ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <source>Handler Position Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="415"/>
-        <source>Air</source>
+        <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>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="420"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="421"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="424"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="425"/>
-        <source>Air</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <source>AIR</source>
+        <translation type="unfinished">Zrak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="986"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="987"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
         <translation type="unfinished">Trajanje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="988"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="989"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1141"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1142"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2575,75 +2693,85 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="851"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="937"/>
+        <source>Available Gases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <source>add dive data point</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1051"/>
+        <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
         <translation type="unfinished">Br.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1052"/>
+        <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
         <translation type="unfinished">Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
         <translation type="unfinished">m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
         <translation type="unfinished">ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1055"/>
+        <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
         <translation type="unfinished">min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
         <translation type="unfinished">lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1058"/>
+        <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
         <translation type="unfinished">Odijelo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1059"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
         <translation type="unfinished">Boca</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1061"/>
+        <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
         <translation type="unfinished">SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1062"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1063"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
         <translation type="unfinished">maxCNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1064"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
         <translation type="unfinished">Lokacija</translation>
     </message>
@@ -2651,14 +2779,20 @@ Please, remove them first.</source>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="138"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
         <translation type="unfinished">Greška</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="142"/>
-        <source>retry</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
+        <source>Retry</source>
+        <translation type="unfinished">Pokušaj ponovo</translation>
     </message>
 </context>
 <context>
@@ -2718,6 +2852,7 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
         <translation type="unfinished">Bilješke</translation>
     </message>
@@ -2732,225 +2867,238 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <source>M/d/yy h:mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="108"/>
-        <location filename="../qt-ui/maintab.cpp" line="307"/>
+        <location filename="../qt-ui/maintab.ui" line="112"/>
+        <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
         <translation type="unfinished">Lokacija</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="122"/>
+        <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="136"/>
+        <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
         <translation type="unfinished">Voditelj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="143"/>
+        <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
         <translation type="unfinished">Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="166"/>
+        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
         <translation type="unfinished">Ocjena</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="173"/>
+        <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
         <translation type="unfinished">Vidljivost</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="182"/>
+        <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
         <translation type="unfinished">Odijelo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="206"/>
-        <location filename="../qt-ui/maintab.cpp" line="308"/>
+        <location filename="../qt-ui/maintab.ui" line="217"/>
+        <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
         <translation type="unfinished">Bilješke</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="232"/>
+        <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
         <translation type="unfinished">Oprema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="319"/>
+        <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
         <translation type="unfinished">Informacije o uronu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="361"/>
+        <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
         <translation type="unfinished">Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="380"/>
+        <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="399"/>
+        <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="418"/>
+        <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="437"/>
-        <location filename="../qt-ui/maintab.ui" line="692"/>
+        <location filename="../qt-ui/maintab.ui" line="466"/>
+        <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
         <translation type="unfinished">SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="456"/>
+        <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="475"/>
+        <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="494"/>
+        <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="513"/>
+        <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="532"/>
+        <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="551"/>
+        <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="570"/>
+        <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
         <translation type="unfinished">Trajanje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="589"/>
+        <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
         <translation type="unfinished">Statistike</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="668"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation type="unfinished">Dubina</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="680"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation type="unfinished">Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="704"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation type="unfinished">Trajanje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="716"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation type="unfinished">Ukupno trajanje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="735"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation type="unfinished">Uroni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="68"/>
+        <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
         <translation type="unfinished">Boce</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="129"/>
-        <location filename="../qt-ui/maintab.cpp" line="131"/>
-        <source>This trip is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <source>Trip Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="137"/>
-        <location filename="../qt-ui/maintab.cpp" line="139"/>
-        <source>This dive is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="296"/>
+        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <source>Trip Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="286"/>
-        <source>Trip Location</source>
+        <location filename="../qt-ui/maintab.cpp" line="134"/>
+        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="288"/>
-        <source>Trip Notes</source>
+        <location filename="../qt-ui/maintab.cpp" line="143"/>
+        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
-        <location filename="../qt-ui/maintab.cpp" line="337"/>
-        <location filename="../qt-ui/maintab.cpp" line="338"/>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="146"/>
+        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <source>This dive is being edited. Select Save or Cancel when done.</source>
+        <translation type="unfinished"></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"/>
         <source>/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <source>unknown</source>
+        <translation type="unfinished">nepoznato</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
         <translation type="unfinished">N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
         <translation type="unfinished">S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
         <translation type="unfinished">E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
         <translation type="unfinished">W</translation>
     </message>
@@ -2963,308 +3111,432 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="177"/>
         <source>File</source>
-        <translation type="unfinished">Datoteka</translation>
+        <translation type="obsolete">Datoteka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="196"/>
         <source>Log</source>
-        <translation type="unfinished">Dnevnik</translation>
+        <translation type="obsolete">Dnevnik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="211"/>
         <source>View</source>
-        <translation type="unfinished">Pregled</translation>
+        <translation type="obsolete">Pregled</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="226"/>
+        <location filename="../qt-ui/mainwindow.ui" line="218"/>
         <source>Filter</source>
         <translation type="unfinished">Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="232"/>
         <source>Help</source>
-        <translation type="unfinished">Pomoć</translation>
+        <translation type="obsolete">Pomoć</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="245"/>
+        <location filename="../qt-ui/mainwindow.ui" line="177"/>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <source>&amp;Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <source>&amp;View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <source>&amp;Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>&amp;New logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
         <translation type="unfinished">Novi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <source>&amp;Open logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="256"/>
+        <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
+        <location filename="../qt-ui/mainwindow.ui" line="281"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation type="unfinished">Spremi kao</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
+        <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="277"/>
+        <location filename="../qt-ui/mainwindow.ui" line="292"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation type="unfinished">Zatvori</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="285"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="176"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <source>Export UDDF</source>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <source>Export &amp;UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
-        <source>Print</source>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <source>Ctrl+U</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="301"/>
-        <source>Ctrl+P</source>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <source>&amp;Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
-        <source>Preferences</source>
-        <translation type="unfinished">Postavke</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <source>Ctrl+,</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="311"/>
-        <source>Quit</source>
-        <translation type="unfinished">Izlaz</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
-        <source>Ctrl+Q</source>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <source>Import from &amp;dive computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <source>Download from Dive computer</source>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
-        <source>Ctrl+D</source>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <source>Ctrl+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="327"/>
-        <source>Download from Web Service</source>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <source>&amp;Edit Device Names</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="332"/>
-        <source>Edit Device Names</source>
-        <translation type="unfinished">Naziv uređaja</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <source>Ctrl++</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="337"/>
-        <source>Add Dive</source>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <source>&amp;Renumber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
-        <source>Renumber</source>
-        <translation type="unfinished">Renumeriraj</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Ctrl+R</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
-        <source>Auto Group</source>
+        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <source>Toggle &amp;Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
-        <source>Toggle Zoom</source>
-        <translation type="unfinished">Uključi/isključi povećanje</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <source>&amp;Yearly Statistics</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
-        <source>Yearly Statistics</source>
-        <translation type="unfinished">Godišnje statistike</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <source>Ctrl+Y</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
-        <source>View List</source>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Dive List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="365"/>
-        <source>Ctrl+2</source>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <source>Profile</source>
+        <translation type="unfinished">Profil</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <source>Info</source>
+        <translation type="unfinished">Informacije</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
-        <source>View Profile</source>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <source>User &amp;Manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="373"/>
-        <source>Ctrl+3</source>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <source>Globe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
-        <source>View Info</source>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <source>P&amp;lan Dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="381"/>
-        <source>Ctrl+4</source>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <source>Ctrl+L</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <source>Import CSV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <source>Import CS&amp;V</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <source>Import from Divelogs.de</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <source>Preferences</source>
+        <translation type="unfinished">Postavke</translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="obsolete">Izlaz</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <source>Ctrl+D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Device Names</source>
+        <translation type="obsolete">Naziv uređaja</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <source>Add Dive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Renumber</source>
+        <translation type="obsolete">Renumeriraj</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/mainwindow.ui" line="386"/>
-        <source>View All</source>
+        <source>Auto Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="389"/>
+        <source>Toggle Zoom</source>
+        <translation type="obsolete">Uključi/isključi povećanje</translation>
+    </message>
+    <message>
+        <source>Yearly Statistics</source>
+        <translation type="obsolete">Godišnje statistike</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <source>Ctrl+2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <source>Ctrl+3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <source>Ctrl+4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>Ctrl+1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Prev DC</source>
         <translation type="unfinished">Prethodno računalo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
+        <location filename="../qt-ui/mainwindow.ui" line="439"/>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="402"/>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Next DC</source>
         <translation type="unfinished">Sljedeće računalo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="405"/>
+        <location filename="../qt-ui/mainwindow.ui" line="447"/>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="410"/>
+        <location filename="../qt-ui/mainwindow.ui" line="452"/>
         <source>Select Events</source>
         <translation type="unfinished">Odaberi događaje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
         <source>Input Plan</source>
         <translation type="unfinished">Unesi plan urona</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
         <source>About Subsurface</source>
         <translation type="unfinished">O programu Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>User Manual</source>
-        <translation type="unfinished">Korisnički priručnik</translation>
+        <translation type="obsolete">Korisnički priručnik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>F1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="433"/>
-        <source>View Globe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="478"/>
         <source>Ctrl+5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="441"/>
-        <source>Dive Planner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="108"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Open File</source>
         <translation type="unfinished">Otvori datoteku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="271"/>
-        <source>manually added dive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="448"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="450"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="455"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
         <translation type="unfinished">Spremi promjene?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="456"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="695"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="696"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="144"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="250"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="286"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="197"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3327,215 +3599,235 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="218"/>
+        <location filename="../qt-ui/preferences.ui" line="199"/>
+        <source>Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="205"/>
+        <source>Use Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="225"/>
+        <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="235"/>
+        <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="245"/>
+        <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="269"/>
+        <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
         <translation type="unfinished">Dubina</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="276"/>
+        <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
         <translation type="unfinished">Metar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="286"/>
+        <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
         <translation type="unfinished">Stope</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
         <translation type="unfinished">Pritisak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="303"/>
+        <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
         <translation type="unfinished">Bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="313"/>
+        <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="330"/>
+        <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
         <translation type="unfinished">Litra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="340"/>
+        <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
         <translation type="unfinished">CuFt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="350"/>
+        <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
         <translation type="unfinished">Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="357"/>
+        <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
         <translation type="unfinished">Celzijusa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
         <translation type="unfinished">Fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="377"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
         <translation type="unfinished">Težina</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
         <translation type="unfinished">lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="464"/>
+        <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="472"/>
+        <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="495"/>
-        <location filename="../qt-ui/preferences.ui" line="536"/>
-        <location filename="../qt-ui/preferences.ui" line="577"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="513"/>
+        <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="554"/>
+        <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="595"/>
+        <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="618"/>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="634"/>
+        <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="643"/>
+        <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="666"/>
+        <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="677"/>
+        <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="700"/>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="710"/>
+        <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="721"/>
-        <source>Show time</source>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
+        <source>Calculate NDL/TTS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="733"/>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>Show SAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
+        <source>GFLow at max depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="739"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
-        <source>XML Files (*.xml)</source>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3673,51 +3965,86 @@ Please, remove them first.</source>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="257"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="259"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <source>Hide events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <source>Hide all %1 events?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <source>Remove the selected event?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <source>%1 @ %2:%3</source>
+        <translation type="unfinished"></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>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="337"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="383"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="384"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="582"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="850"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <source>Measure properties of dive segments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
+        <source>Scale your dive to screen size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
+        <source>Edit</source>
+        <translation type="unfinished">Uredi</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
         <translation type="unfinished">zrak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="584"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="851"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="859"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
         <translation type="unfinished">Neplanirani prelazak na OC sustav</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="861"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished"> započni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="862"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished"> završi</translation>
@@ -3726,62 +4053,62 @@ Please, remove them first.</source>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1497"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
         <translation type="unfinished">nepoznato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1502"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1505"/>
+        <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1512"/>
+        <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1517"/>
+        <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
         <translation type="unfinished">Boca</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1519"/>
+        <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
         <translation type="unfinished">Mješavina</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
         <translation type="unfinished">Potrošeno plina</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1547"/>
+        <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
         <translation type="unfinished">SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1549"/>
+        <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
         <translation type="unfinished">Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1551"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1564"/>
+        <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1570"/>
+        <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3790,30 +4117,30 @@ Please, remove them first.</source>
     <name>QObject</name>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="44"/>
         <source>AIR</source>
         <translation type="unfinished">Zrak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="38"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="45"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="723"/>
+        <source>Remove this Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>EAN32</source>
-        <translation type="unfinished">EAN32</translation>
+        <translation type="obsolete">EAN32</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="46"/>
         <source>EAN36</source>
-        <translation type="unfinished">EAN36</translation>
+        <translation type="obsolete">EAN36</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="47"/>
-        <source>Choose Gas</source>
+        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <source>No location data - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="188"/>
-        <source>No location data - move the map and double-click to set the dive location</source>
+        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3822,17 +4149,17 @@ Please, remove them first.</source>
         <translation type="unfinished">Zatvori</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="26"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation type="unfinished">Ø</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="29"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation type="unfinished">Min.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation type="unfinished">Max.</translation>
     </message>
@@ -3851,92 +4178,95 @@ Please, remove them first.</source>
     </message>
 </context>
 <context>
-    <name>SubsurfaceAbout</name>
+    <name>ShiftTimesDialog</name>
     <message>
-        <location filename="../qt-ui/about.ui" line="23"/>
-        <source>About Subsurface</source>
-        <translation type="unfinished">O programu Subsurface</translation>
+        <location filename="../qt-ui/shifttimes.ui" line="14"/>
+        <source>Shift selected times</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
+        <location filename="../qt-ui/shifttimes.ui" line="35"/>
+        <source>Shift times of selected dives by</source>
         <translation type="unfinished"></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>
+        <location filename="../qt-ui/shifttimes.ui" line="80"/>
+        <source>h:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="22"/>
-        <source>&amp;License</source>
+        <location filename="../qt-ui/shifttimes.ui" line="90"/>
+        <source>earlier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
-        <source>&amp;Website</source>
+        <location filename="../qt-ui/shifttimes.ui" line="97"/>
+        <source>later</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SubsurfaceWebServices</name>
+    <name>SubsurfaceAbout</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="14"/>
-        <source>Download Location Data</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/about.ui" line="23"/>
+        <source>About Subsurface</source>
+        <translation type="unfinished">O programu Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="37"/>
-        <source>Download</source>
+        <location filename="../qt-ui/about.ui" line="64"/>
+        <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="44"/>
-        <source>Enter your ID here</source>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="51"/>
-        <source>User ID</source>
+        <location filename="../qt-ui/about.cpp" line="22"/>
+        <source>&amp;License</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="58"/>
-        <source>Status:</source>
+        <location filename="../qt-ui/about.cpp" line="23"/>
+        <source>&amp;Website</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="49"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
         <translation type="unfinished">Web servis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="90"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="106"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="130"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
         <translation type="unfinished">Greška u komunikaciji: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
         <translation type="unfinished">Neispravna korisnička oznaka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
         <translation type="unfinished">Ne mogu obraditi odziv</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="133"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
         <translation type="unfinished">Preuzimanje uspješno!</translation>
     </message>
@@ -3957,17 +4287,17 @@ Please, remove them first.</source>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Bar</source>
         <translation type="unfinished">Bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3975,7 +4305,7 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1393"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3983,96 +4313,139 @@ Please, remove them first.</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>WebServices</name>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="14"/>
+        <source>Download Location Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="20"/>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="27"/>
+        <source>Enter your ID here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="34"/>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="58"/>
+        <source>User ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="72"/>
+        <source>Password</source>
+        <translation type="unfinished">Lozinka</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="86"/>
+        <source>Upload</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
         <translation type="unfinished">Vrsta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
         <translation type="unfinished">Težina</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="460"/>
+        <source>Clicking here will remove this weigthsystem.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
- &gt; Month</source>
+ &gt; Month / Trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
         <translation type="unfinished">Br.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1307"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1310"/>
+        <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1311"/>
+        <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1312"/>
-        <location filename="../qt-ui/models.cpp" line="1315"/>
-        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <location filename="../qt-ui/models.cpp" line="1418"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1313"/>
-        <location filename="../qt-ui/models.cpp" line="1316"/>
-        <location filename="../qt-ui/models.cpp" line="1319"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"></translation>
@@ -4081,91 +4454,74 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="44"/>
+        <location filename="../dive.c" line="57"/>
         <source>pascal</source>
         <translation type="unfinished">Pa</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="48"/>
-        <location filename="../qt-gui.cpp" line="323"/>
+        <location filename="../dive.c" line="61"/>
+        <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
         <translation type="unfinished">bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="52"/>
-        <location filename="../qt-gui.cpp" line="326"/>
+        <location filename="../dive.c" line="65"/>
+        <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
         <translation type="unfinished">psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="88"/>
-        <location filename="../qt-gui.cpp" line="304"/>
+        <location filename="../dive.c" line="101"/>
+        <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
         <translation type="unfinished">l</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="93"/>
-        <location filename="../qt-gui.cpp" line="307"/>
+        <location filename="../dive.c" line="106"/>
+        <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
         <translation type="unfinished">cuft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="121"/>
-        <location filename="../qt-gui.cpp" line="207"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
         <translation type="unfinished">m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="126"/>
-        <location filename="../qt-gui.cpp" line="210"/>
+        <location filename="../dive.c" line="139"/>
+        <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
         <translation type="unfinished">ft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="170"/>
-        <location filename="../qt-gui.cpp" line="233"/>
+        <location filename="../dive.c" line="183"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
         <translation type="unfinished">lbs</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
-        <location filename="../qt-gui.cpp" line="231"/>
+        <location filename="../dive.c" line="187"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="966"/>
+        <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
         <translation type="unfinished">(%s) ili (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="473"/>
         <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <translation type="unfinished">%1$s %3$d. %2$s %4$d %5$02d:%6$02d</translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="490"/>
-        <source>%1$s %2$d, %3$d
-%4$02d:%5$02d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="512"/>
-        <source>%1$s %2$d (%3$d dives)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="519"/>
-        <source>%1$s %2$d (1 dive)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">%1$s %3$d. %2$s %4$d %5$02d:%6$02d</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="550"/>
-        <location filename="../planner.c" line="94"/>
-        <location filename="../planner.c" line="748"/>
-        <location filename="../planner.c" line="749"/>
-        <location filename="../statistics.c" line="360"/>
-        <location filename="../statistics.c" line="371"/>
+        <location filename="../divelist.c" line="488"/>
+        <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"/>
         <source>air</source>
         <translation type="unfinished">zrak</translation>
     </message>
@@ -4195,312 +4551,324 @@ Maximum</source>
         <translation type="unfinished">clip-on</translation>
     </message>
     <message>
-        <location filename="../file.c" line="106"/>
-        <location filename="../file.c" line="108"/>
-        <location filename="../file.c" line="303"/>
-        <location filename="../file.c" line="305"/>
+        <location filename="../file.c" line="107"/>
+        <location filename="../file.c" line="109"/>
+        <location filename="../file.c" line="308"/>
+        <location filename="../file.c" line="310"/>
+        <location filename="../file.c" line="390"/>
+        <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation type="unfinished">Nije uspjelo čitanje &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <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>
+    </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>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
         <translation type="unfinished">nijedan</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
         <translation type="unfinished">deko zastoj</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
         <translation type="unfinished">rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
         <translation type="unfinished">izron</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
         <translation type="unfinished">strop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
         <translation type="unfinished">opterećenje</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
         <translation type="unfinished">odašiljač</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
         <translation type="unfinished">povreda</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
         <translation type="unfinished">bookmark</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
         <translation type="unfinished">površina</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
         <translation type="unfinished">sigurnosna stanka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
         <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
         <translation type="unfinished">promjena plina</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
         <translation type="unfinished">sigurnosna stanka (opcionalna)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
         <translation type="unfinished">sigurnosna stanka (obavezna)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
         <translation type="unfinished">dubinska stanka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
         <translation type="unfinished">strop (sigurnosni zastoj)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
         <translation type="unfinished">trajanje urona</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
         <translation type="unfinished">Max dubina</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
         <translation type="unfinished">OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
         <translation type="unfinished">PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
         <translation type="unfinished">preostalo trajanje zraka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
         <translation type="unfinished">rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
         <translation type="unfinished">kurs</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
         <translation type="unfinished">upozorenje tkivo</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
         <translation type="unfinished">non stop vrijeme</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="157"/>
+        <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
         <translation type="unfinished">neispravan broj događaja</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="390"/>
+        <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
         <translation type="unfinished">Ne mogu kreirati parser za %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="396"/>
+        <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
         <translation type="unfinished">Greška pri registraciji podataka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="405"/>
+        <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
         <translation type="unfinished">Greška pri parsiranju datuma i vremena</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
         <translation type="unfinished">Uron #%d - %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="427"/>
+        <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
         <translation type="unfinished">Greška pri parsiranju vremena urona</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="437"/>
+        <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
         <translation type="unfinished">Greška pri parsiranju maksimalne dubine</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="447"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
         <translation type="unfinished">Greška pri parsiranju broja mješavina</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
         <translation type="unfinished">Greška pri dohvaćanju saliniteta vode</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="469"/>
+        <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
         <translation type="unfinished">Greška pri parsiranju mješavine plinova</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
         <translation type="unfinished">Greška pri parsiranju uzoraka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="613"/>
+        <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
         <translation type="unfinished">Događaj: čekanje na korisničku akciju</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="621"/>
+        <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation type="unfinished">model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="663"/>
+        <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
         <translation type="unfinished">Greška pri registraciji event handlera.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="668"/>
+        <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished">Greška pri registraciji cancellation handlera</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="672"/>
+        <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
         <translation type="unfinished">Greška pri uvozu podataka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="690"/>
+        <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished">Ne mogu kreirati libdivecomputer kontekst</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished">Nije uspjelo otvaranje %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="549"/>
+        <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
         <translation type="unfinished">Neobično očitanje postotka %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1695"/>
+        <location filename="../parse-xml.c" line="1717"/>
         <source>Failed to parse &apos;%s&apos;.
 </source>
         <translation type="unfinished">Nije uspjelo parsiranje &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1696"/>
+        <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation type="unfinished">Nije uspjelo parsiranje &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1894"/>
+        <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
         <translation type="unfinished">Neuspjeo get_events na bazi.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1929"/>
+        <location filename="../parse-xml.c" line="1951"/>
         <source>Database connection failed &apos;%s&apos;.
 </source>
         <translation type="unfinished">Neuspjelo spajanje na bazu &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1936"/>
+        <location filename="../parse-xml.c" line="1958"/>
         <source>Database query failed &apos;%s&apos;.
 </source>
         <translation type="unfinished">Neuspjeo upit na bazu &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2048"/>
+        <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
         <translation type="unfinished">Ne mogu otvoriti stylesheet (%s)/%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="96"/>
-        <location filename="../statistics.c" line="363"/>
+        <location filename="../planner.c" line="98"/>
+        <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
         <translation type="unfinished">EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="131"/>
+        <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation type="unfinished">Ne mogu naći plin %d/%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="192"/>
         <source>Cylinder for planning</source>
-        <translation type="unfinished">Boca za planiranje</translation>
+        <translation type="obsolete">Boca za planiranje</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="217"/>
         <source>Simulated Dive</source>
-        <translation type="unfinished">Simulirani uron</translation>
+        <translation type="obsolete">Simulirani uron</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="294"/>
+        <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
         <translation type="unfinished">Previše mješavina plinova</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="472"/>
+        <location filename="../planner.c" line="493"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -4513,180 +4881,173 @@ temeljen na GFlow = %.0f i GFhigh = %.0f
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="513"/>
+        <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished">Prelazak na %.*f %s u %d:%02d min - ukupno vrijeme %d:%02u na %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="522"/>
+        <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished">Stanka na %.*f %s u trajanju %d:%02d min - Ukupno vrijeme %d:%02u na %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
         <translation type="unfinished">Prebaci plin na %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
         <translation type="unfinished">Potrošnja plina:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="552"/>
+        <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
         <translation type="unfinished">%.0f%s %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="776"/>
         <source>ean</source>
         <translation type="unfinished">ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1154"/>
         <source>D:%.1f %s</source>
-        <translation type="unfinished">D:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1158"/>
-        <source>%s
-T:%d:%02d</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">D:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
         <translation type="unfinished">%s
 D:%d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
         <translation type="unfinished">%s
 T:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1177"/>
+        <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation type="unfinished">%s
 Izračunati strop %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1189"/>
+        <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation type="unfinished">%s
 Sigurnosni zastanak:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1199"/>
+        <source>@:%d:%02d
+D:%.1f %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1219"/>
+        <source>%s
+SAC:%2.1fl/min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation type="unfinished">%s
 Sigurnosni zastoj:nepoz.vrijeme @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation type="unfinished">%s
 Deko:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1211"/>
+        <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation type="unfinished">%s
 Deko:nepoznato vrijeme @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1217"/>
+        <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
         <translation type="unfinished">%s
 U deko</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
-        <source>%s
-NDL:-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1275"/>
         <source>%s
 NDL:%umin</source>
         <translation type="unfinished">%s
 NDL:%umin</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
-        <source>%s
-TTS:%umin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1223"/>
         <source>%s
 CNS:%u%%</source>
         <translation type="unfinished">%s
 CNS:%u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1227"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation type="unfinished">%s
 pO%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1231"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation type="unfinished">%s
 pN%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1243"/>
+        <location filename="../profile.c" line="1235"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation type="unfinished">%s
 pHe:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1240"/>
         <source>%s
 MOD:%d%s</source>
         <translation type="unfinished">%s
 MOD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1247"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -4697,295 +5058,346 @@ END:%d%s
 EADD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1349"/>
+        <location filename="../profile.c" line="1280"/>
+        <source>%s
+Deco:%umin @ %.0f %s (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1289"/>
+        <source>%s
+In deco (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>%s
+NDL:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1296"/>
+        <source>%s
+TTS:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
-        <location filename="../profile.c" line="1357"/>
+        <location filename="../profile.c" line="1409"/>
+        <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1361"/>
+        <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1365"/>
+        <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1369"/>
-        <source>%s%sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1425"/>
+        <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1373"/>
-        <location filename="../profile.c" line="1377"/>
-        <source>%s %sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1429"/>
+        <location filename="../profile.c" line="1433"/>
+        <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1384"/>
+        <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="284"/>
+        <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="288"/>
+        <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../qt-gui.cpp" line="460"/>
+        <source>%1, %2 %3, %4 %5:%6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="473"/>
+        <source>%1 %2, %3
+%4:%5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="486"/>
+        <source>%1 %2 (%3 dives)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="491"/>
+        <source>%1 %2 (1 dive)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>invalid</source>
-        <translation type="unfinished">neispravan</translation>
+        <translation type="obsolete">neispravan</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>boat</source>
         <translation type="unfinished">brod</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>shore</source>
         <translation type="unfinished">obala</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>drift</source>
         <translation type="unfinished">drift</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>deep</source>
         <translation type="unfinished">dubok</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>cavern</source>
         <translation type="unfinished">pećina</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="14"/>
         <source>ice</source>
         <translation type="unfinished">led</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>wreck</source>
         <translation type="unfinished">olupina</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>cave</source>
         <translation type="unfinished">špilja</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>altitude</source>
         <translation type="unfinished">nadmorska visina</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>pool</source>
         <translation type="unfinished">bazen</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>lake</source>
         <translation type="unfinished">jezero</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="16"/>
         <source>river</source>
         <translation type="unfinished">rijeka</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="17"/>
         <source>night</source>
         <translation type="unfinished">noć</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="17"/>
+        <source>fresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="17"/>
+        <source>student</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>freshwater</source>
-        <translation type="unfinished">slatka voda</translation>
+        <translation type="obsolete">slatka voda</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
         <source>training</source>
-        <translation type="unfinished">trening</translation>
+        <translation type="obsolete">trening</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
         <source>teaching</source>
-        <translation type="unfinished">poduka</translation>
+        <translation type="obsolete">poduka</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
         <source>photo</source>
         <translation type="unfinished">fotografija</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
         <source>video</source>
         <translation type="unfinished">video</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
+        <source>instructor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="19"/>
         <source>deco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="199"/>
+        <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
         <translation type="unfinished">više od %d dana</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="205"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation type="unfinished">%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="207"/>
+        <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
         <translation type="unfinished">%dst %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="218"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation type="unfinished">za urone #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="225"/>
+        <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
         <translation type="unfinished">za odabrane urone</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="260"/>
+        <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
         <translation type="unfinished">za uron #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="262"/>
+        <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
         <translation type="unfinished">za odabrani uron</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="264"/>
+        <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
         <translation type="unfinished">za sve urone</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="266"/>
+        <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
         <translation type="unfinished">(nema urona)</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="363"/>
-        <source>, EAN%d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
         <translation type="unfinished">Ned</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
         <translation type="unfinished">Pon</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
         <translation type="unfinished">Uto</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
         <translation type="unfinished">Sri</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
         <translation type="unfinished">Čet</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
         <translation type="unfinished">Pet</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
         <translation type="unfinished">Sub</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
         <translation type="unfinished">Sij</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
         <translation type="unfinished">Velj</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
         <translation type="unfinished">Ožu</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
         <translation type="unfinished">Tra</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
         <translation type="unfinished">Svi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
         <translation type="unfinished">Lip</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
         <translation type="unfinished">Srp</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
         <translation type="unfinished">Kol</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
         <translation type="unfinished">Ruj</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
         <translation type="unfinished">Lis</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
         <translation type="unfinished">Stu</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
         <translation type="unfinished">Pro</translation>
     </message>
diff --git a/translations/subsurface_it_IT.ts b/translations/subsurface_it_IT.ts
index f83c04600..a810d2e41 100644
--- a/translations/subsurface_it_IT.ts
+++ b/translations/subsurface_it_IT.ts
@@ -1957,42 +1957,135 @@ tranlators here
     </message>
 </context>
 <context>
+    <name>CSVImportDialog</name>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <source>Import File (CSV)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <source>Field Separator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <source>Field Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <source>Time</source>
+        <translation type="unfinished">Tempo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <source>Depth</source>
+        <translation type="unfinished">Profondità</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <source>Temp</source>
+        <translation type="unfinished">Temperatura</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
+        <source>Po2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <source>Cns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <source>Stopdepth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <source>Pre-configured imports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>Open CSV Log File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>CSV Files (*.csv)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
         <translation type="unfinished">Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
         <translation type="unfinished">Dimensione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="65"/>
+        <source>Switch at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="163"/>
+        <source>Clicking here will remove this cylinder.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="385"/>
+        <source>Cylinder cannot be removed</source>
+        <translation type="unfinished"></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>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
@@ -2016,30 +2109,35 @@ tranlators here
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Device ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Model</source>
         <translation type="unfinished">Modello</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
         <translation type="unfinished">Nickname</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <source>Clicking here will remove this divecomputer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1009"/>
+        <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1011"/>
+        <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2047,186 +2145,206 @@ tranlators here
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="39"/>
+        <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="398"/>
+        <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="399"/>
+        <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="400"/>
-        <source>collapse</source>
+        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <source>collapse others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="402"/>
-        <source>remove dive from trip</source>
+        <location filename="../qt-ui/divelistview.cpp" line="638"/>
+        <source>remove dive(s) from trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="405"/>
-        <source>Merge trip with trip above</source>
-        <translation type="unfinished">Raggruppa il viaggio con il viaggio sopra</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="639"/>
+        <source>create new trip above</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="406"/>
-        <source>Merge trip with trip below</source>
-        <translation type="unfinished">Raggruppa il viaggio con il viaggio sotto</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="640"/>
+        <source>add dive(s) to trip immideately above</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="410"/>
-        <source>delete dive</source>
+        <location filename="../qt-ui/divelistview.cpp" line="643"/>
+        <source>merge trip with trip above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="412"/>
-        <source>merge selected dives</source>
+        <location filename="../qt-ui/divelistview.cpp" line="644"/>
+        <source>merge trip with trip below</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../qt-ui/divelistview.cpp" line="648"/>
+        <source>delete dive(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
-        <source>Bottom SAC</source>
+        <location filename="../qt-ui/divelistview.cpp" line="652"/>
+        <source>save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
-        <source>High GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="653"/>
+        <source>export As UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
-        <source>SAC on DECO Stop</source>
+        <location filename="../qt-ui/divelistview.cpp" line="654"/>
+        <source>shift times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
-        <source>Low GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
+        <source>Save Dives As...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="114"/>
-        <source>Last Stop at 6m</source>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
+        <source>Save File as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="141"/>
-        <source>Start Time</source>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="148"/>
-        <source>ATM Pressure</source>
+        <source>Merge trip with trip above</source>
+        <translation type="obsolete">Raggruppa il viaggio con il viaggio sopra</translation>
+    </message>
+    <message>
+        <source>Merge trip with trip below</source>
+        <translation type="obsolete">Raggruppa il viaggio con il viaggio sotto</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <source>merge selected dives</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DivePlannerGraphics</name>
+    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="143"/>
-        <source>10m</source>
+        <location filename="../qt-ui/diveplanner.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="145"/>
-        <source>30ft</source>
+        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <source>Bottom SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="146"/>
-        <source>Increase maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <source>SAC on DECO Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="147"/>
-        <source>Decreases maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <source>Increase minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>10min</source>
+        <location filename="../qt-ui/diveplanner.ui" line="108"/>
+        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>Decreases minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <source>Last Stop at 6m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
-        <source>Handler Position Error</source>
+        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="386"/>
-        <source>One or more of your stops will be lost with this operations, 
-Please, remove them first.</source>
+        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <source>ATM Pressure</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DivePlannerGraphics</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <source>10m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="415"/>
-        <source>Air</source>
+        <location filename="../qt-ui/diveplanner.cpp" line="136"/>
+        <source>30ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <source>Handler Position Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="420"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="421"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="424"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="425"/>
-        <source>Air</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <source>AIR</source>
+        <translation type="unfinished">ARIA</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="986"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="987"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
         <translation type="unfinished">Durata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="988"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="989"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1141"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1142"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2234,75 +2352,85 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="851"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="937"/>
+        <source>Available Gases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <source>add dive data point</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1051"/>
+        <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
         <translation type="unfinished">#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1052"/>
+        <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
         <translation type="unfinished">Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
         <translation type="unfinished">m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
         <translation type="unfinished">ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1055"/>
+        <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
         <translation type="unfinished">min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
         <translation type="unfinished">lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1058"/>
+        <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
         <translation type="unfinished">Muta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1059"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
         <translation type="unfinished">Bombola</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1061"/>
+        <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
         <translation type="unfinished">CAS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1062"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1063"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
         <translation type="unfinished">max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1064"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
         <translation type="unfinished">Luogo</translation>
     </message>
@@ -2310,15 +2438,21 @@ Please, remove them first.</source>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="138"/>
-        <source>Error</source>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="142"/>
-        <source>retry</source>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
+        <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
+        <source>Retry</source>
+        <translation type="unfinished">Riprova</translation>
+    </message>
 </context>
 <context>
     <name>DownloadFromDiveComputer</name>
@@ -2377,6 +2511,7 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
         <translation type="unfinished">Note dell&apos;immersione</translation>
     </message>
@@ -2391,225 +2526,238 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <source>M/d/yy h:mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="108"/>
-        <location filename="../qt-ui/maintab.cpp" line="307"/>
+        <location filename="../qt-ui/maintab.ui" line="112"/>
+        <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
         <translation type="unfinished">Luogo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="122"/>
+        <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="136"/>
+        <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
         <translation type="unfinished">Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="143"/>
+        <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
         <translation type="unfinished">Compagno</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="166"/>
+        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
         <translation type="unfinished">Valutazione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="173"/>
+        <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
         <translation type="unfinished">Visibilità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="182"/>
+        <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
         <translation type="unfinished">Muta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="206"/>
-        <location filename="../qt-ui/maintab.cpp" line="308"/>
+        <location filename="../qt-ui/maintab.ui" line="217"/>
+        <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
         <translation type="unfinished">Note</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="232"/>
+        <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
         <translation type="unfinished">Attrezzatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="319"/>
+        <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
         <translation type="unfinished">Informazioni sull&apos;immersione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="361"/>
+        <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
         <translation type="unfinished">Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="380"/>
+        <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="399"/>
+        <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="418"/>
+        <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="437"/>
-        <location filename="../qt-ui/maintab.ui" line="692"/>
+        <location filename="../qt-ui/maintab.ui" line="466"/>
+        <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
         <translation type="unfinished">CAS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="456"/>
+        <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="475"/>
+        <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="494"/>
+        <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="513"/>
+        <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="532"/>
+        <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="551"/>
+        <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="570"/>
+        <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
         <translation type="unfinished">Tempo d&apos;Immersione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="589"/>
+        <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
         <translation type="unfinished">Statistiche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="668"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation type="unfinished">Profondità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="680"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation type="unfinished">Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="704"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation type="unfinished">Durata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="716"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation type="unfinished">Tempo Totale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="735"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation type="unfinished">Immersioni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="68"/>
+        <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
         <translation type="unfinished">Bombole</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="129"/>
-        <location filename="../qt-ui/maintab.cpp" line="131"/>
-        <source>This trip is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <source>Trip Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="137"/>
-        <location filename="../qt-ui/maintab.cpp" line="139"/>
-        <source>This dive is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="296"/>
+        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <source>Trip Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="286"/>
-        <source>Trip Location</source>
+        <location filename="../qt-ui/maintab.cpp" line="134"/>
+        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="288"/>
-        <source>Trip Notes</source>
+        <location filename="../qt-ui/maintab.cpp" line="143"/>
+        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
-        <location filename="../qt-ui/maintab.cpp" line="337"/>
-        <location filename="../qt-ui/maintab.cpp" line="338"/>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="146"/>
+        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <source>This dive is being edited. Select Save or Cancel when done.</source>
+        <translation type="unfinished"></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"/>
         <source>/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <source>unknown</source>
+        <translation type="unfinished">sconosciuto</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
         <translation type="unfinished">N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
         <translation type="unfinished">E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
         <translation type="unfinished">W</translation>
     </message>
@@ -2622,308 +2770,432 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="177"/>
         <source>File</source>
-        <translation type="unfinished">File</translation>
+        <translation type="obsolete">File</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="196"/>
         <source>Log</source>
-        <translation type="unfinished">Log</translation>
+        <translation type="obsolete">Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="211"/>
         <source>View</source>
-        <translation type="unfinished">Visualizza</translation>
+        <translation type="obsolete">Visualizza</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="226"/>
+        <location filename="../qt-ui/mainwindow.ui" line="218"/>
         <source>Filter</source>
         <translation type="unfinished">Filtro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="232"/>
         <source>Help</source>
-        <translation type="unfinished">Aiuto</translation>
+        <translation type="obsolete">Aiuto</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="177"/>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="245"/>
+        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <source>&amp;Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <source>&amp;View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <source>&amp;Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>&amp;New logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
         <translation type="unfinished">Nuovo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <source>&amp;Open logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="256"/>
+        <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
+        <location filename="../qt-ui/mainwindow.ui" line="281"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation type="unfinished">Salva come</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
+        <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="277"/>
+        <location filename="../qt-ui/mainwindow.ui" line="292"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation type="unfinished">Chiudi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="285"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="176"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <source>Export UDDF</source>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <source>Export &amp;UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
-        <source>Print</source>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <source>Ctrl+U</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="301"/>
-        <source>Ctrl+P</source>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <source>&amp;Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
-        <source>Preferences</source>
-        <translation type="unfinished">Preferenze</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <source>Ctrl+,</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="311"/>
-        <source>Quit</source>
-        <translation type="unfinished">Esci</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
-        <source>Ctrl+Q</source>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <source>Import from &amp;dive computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <source>Download from Dive computer</source>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
-        <source>Ctrl+D</source>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <source>Ctrl+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="327"/>
-        <source>Download from Web Service</source>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <source>&amp;Edit Device Names</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="332"/>
-        <source>Edit Device Names</source>
-        <translation type="unfinished">Modifica il nome della periferica</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <source>Ctrl++</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="337"/>
-        <source>Add Dive</source>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <source>&amp;Renumber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
-        <source>Renumber</source>
-        <translation type="unfinished">Rinumera</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Ctrl+R</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
-        <source>Auto Group</source>
+        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <source>Toggle &amp;Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
-        <source>Toggle Zoom</source>
-        <translation type="unfinished">Zoom Alternativo</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <source>&amp;Yearly Statistics</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
-        <source>Yearly Statistics</source>
-        <translation type="unfinished">Statistiche Annuali</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <source>Ctrl+Y</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
-        <source>View List</source>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Dive List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="365"/>
-        <source>Ctrl+2</source>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <source>Profile</source>
+        <translation type="unfinished">Profilo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <source>Info</source>
+        <translation type="unfinished">Informazioni</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
-        <source>View Profile</source>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <source>User &amp;Manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="373"/>
-        <source>Ctrl+3</source>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <source>Globe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
-        <source>View Info</source>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <source>P&amp;lan Dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="381"/>
-        <source>Ctrl+4</source>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <source>Ctrl+L</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <source>Import CSV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <source>Import CS&amp;V</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <source>Import from Divelogs.de</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <source>Preferences</source>
+        <translation type="unfinished">Preferenze</translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="obsolete">Esci</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <source>Ctrl+D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Device Names</source>
+        <translation type="obsolete">Modifica il nome della periferica</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <source>Add Dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Renumber</source>
+        <translation type="obsolete">Rinumera</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/mainwindow.ui" line="386"/>
-        <source>View All</source>
+        <source>Auto Group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle Zoom</source>
+        <translation type="obsolete">Zoom Alternativo</translation>
+    </message>
+    <message>
+        <source>Yearly Statistics</source>
+        <translation type="obsolete">Statistiche Annuali</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <source>Ctrl+2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="389"/>
+        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <source>Ctrl+3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <source>Ctrl+4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>Ctrl+1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Prev DC</source>
         <translation type="unfinished">DC precedente</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
+        <location filename="../qt-ui/mainwindow.ui" line="439"/>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="402"/>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Next DC</source>
         <translation type="unfinished">DC successivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="405"/>
+        <location filename="../qt-ui/mainwindow.ui" line="447"/>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="410"/>
+        <location filename="../qt-ui/mainwindow.ui" line="452"/>
         <source>Select Events</source>
         <translation type="unfinished">Seleziona eventi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
         <source>Input Plan</source>
         <translation type="unfinished">Piano in ingresso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
         <source>About Subsurface</source>
         <translation type="unfinished">Informazioni su Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>User Manual</source>
-        <translation type="unfinished">Manuale Utente</translation>
+        <translation type="obsolete">Manuale Utente</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>F1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="433"/>
-        <source>View Globe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="478"/>
         <source>Ctrl+5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="441"/>
-        <source>Dive Planner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="108"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Open File</source>
         <translation type="unfinished">Apri File</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="271"/>
-        <source>manually added dive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="448"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="450"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="455"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
         <translation type="unfinished">Salvare le modifiche?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="456"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="695"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="696"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="144"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="250"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="286"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="197"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2986,215 +3258,235 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="218"/>
+        <location filename="../qt-ui/preferences.ui" line="199"/>
+        <source>Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="205"/>
+        <source>Use Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="225"/>
+        <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="235"/>
+        <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="245"/>
+        <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="269"/>
+        <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
         <translation type="unfinished">Profondità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="276"/>
+        <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
         <translation type="unfinished">Metro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="286"/>
+        <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
         <translation type="unfinished">Piedi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
         <translation type="unfinished">Pressione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="303"/>
+        <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
         <translation type="unfinished">Bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="313"/>
+        <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="330"/>
+        <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
         <translation type="unfinished">Litri</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="340"/>
+        <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
         <translation type="unfinished">Piedi cubi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="350"/>
+        <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
         <translation type="unfinished">Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="357"/>
+        <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
         <translation type="unfinished">Celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
         <translation type="unfinished">Fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="377"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
         <translation type="unfinished">Peso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
         <translation type="unfinished">lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="464"/>
+        <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="472"/>
+        <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="495"/>
-        <location filename="../qt-ui/preferences.ui" line="536"/>
-        <location filename="../qt-ui/preferences.ui" line="577"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="513"/>
+        <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="554"/>
+        <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="595"/>
+        <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="618"/>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="634"/>
+        <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="643"/>
+        <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="666"/>
+        <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="677"/>
+        <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="700"/>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="710"/>
+        <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="721"/>
-        <source>Show time</source>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
+        <source>Calculate NDL/TTS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="733"/>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>Show SAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
+        <source>GFLow at max depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="739"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
-        <source>XML Files (*.xml)</source>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3332,51 +3624,86 @@ Please, remove them first.</source>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="257"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="259"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <source>Hide events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <source>Hide all %1 events?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <source>Remove the selected event?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <source>%1 @ %2:%3</source>
+        <translation type="unfinished"></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>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="337"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="383"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="384"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="582"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="850"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <source>Measure properties of dive segments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
+        <source>Scale your dive to screen size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
+        <source>Edit</source>
+        <translation type="unfinished">Modifica</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
         <translation type="unfinished">aria</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="584"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="851"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="859"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
         <translation type="unfinished">Bailing out in corcuito aperto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="861"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished">inizio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="862"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished">fine</translation>
@@ -3385,62 +3712,62 @@ Please, remove them first.</source>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1497"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
         <translation type="unfinished">sconosciuto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1502"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1505"/>
+        <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1512"/>
+        <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1517"/>
+        <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
         <translation type="unfinished">Bombola</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1519"/>
+        <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
         <translation type="unfinished">Miscela di gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
         <translation type="unfinished">Gas Usato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1547"/>
+        <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
         <translation type="unfinished">CAS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1549"/>
+        <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
         <translation type="unfinished">CNS massimo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1551"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1564"/>
+        <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1570"/>
+        <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3449,30 +3776,30 @@ Please, remove them first.</source>
     <name>QObject</name>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="44"/>
         <source>AIR</source>
         <translation type="unfinished">ARIA</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="38"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="45"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="723"/>
+        <source>Remove this Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>EAN32</source>
-        <translation type="unfinished">EAN32</translation>
+        <translation type="obsolete">EAN32</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="46"/>
         <source>EAN36</source>
-        <translation type="unfinished">EAN36</translation>
+        <translation type="obsolete">EAN36</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="47"/>
-        <source>Choose Gas</source>
+        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <source>No location data - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="188"/>
-        <source>No location data - move the map and double-click to set the dive location</source>
+        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3481,17 +3808,17 @@ Please, remove them first.</source>
         <translation type="unfinished">Chiudi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="26"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation type="unfinished">Media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="29"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation type="unfinished">Minimo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation type="unfinished">Massimo</translation>
     </message>
@@ -3510,92 +3837,95 @@ Please, remove them first.</source>
     </message>
 </context>
 <context>
-    <name>SubsurfaceAbout</name>
+    <name>ShiftTimesDialog</name>
     <message>
-        <location filename="../qt-ui/about.ui" line="23"/>
-        <source>About Subsurface</source>
-        <translation type="unfinished">Informazioni su Subsurface</translation>
+        <location filename="../qt-ui/shifttimes.ui" line="14"/>
+        <source>Shift selected times</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
+        <location filename="../qt-ui/shifttimes.ui" line="35"/>
+        <source>Shift times of selected dives by</source>
         <translation type="unfinished"></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>
+        <location filename="../qt-ui/shifttimes.ui" line="80"/>
+        <source>h:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="22"/>
-        <source>&amp;License</source>
+        <location filename="../qt-ui/shifttimes.ui" line="90"/>
+        <source>earlier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
-        <source>&amp;Website</source>
+        <location filename="../qt-ui/shifttimes.ui" line="97"/>
+        <source>later</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SubsurfaceWebServices</name>
+    <name>SubsurfaceAbout</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="14"/>
-        <source>Download Location Data</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/about.ui" line="23"/>
+        <source>About Subsurface</source>
+        <translation type="unfinished">Informazioni su Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="37"/>
-        <source>Download</source>
+        <location filename="../qt-ui/about.ui" line="64"/>
+        <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="44"/>
-        <source>Enter your ID here</source>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="51"/>
-        <source>User ID</source>
+        <location filename="../qt-ui/about.cpp" line="22"/>
+        <source>&amp;License</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="58"/>
-        <source>Status:</source>
+        <location filename="../qt-ui/about.cpp" line="23"/>
+        <source>&amp;Website</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="49"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
         <translation type="unfinished">Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="90"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="106"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="130"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
         <translation type="unfinished">Errore di connessione:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
         <translation type="unfinished">Identificatore dell&apos;utente non valido!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
         <translation type="unfinished">Non posso analizzare la risposta!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="133"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
         <translation type="unfinished">Donload effettuato!</translation>
     </message>
@@ -3616,17 +3946,17 @@ Please, remove them first.</source>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Bar</source>
         <translation type="unfinished">Bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3634,7 +3964,7 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1393"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3642,96 +3972,139 @@ Please, remove them first.</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>WebServices</name>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="14"/>
+        <source>Download Location Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="20"/>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="27"/>
+        <source>Enter your ID here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="34"/>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="58"/>
+        <source>User ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="72"/>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="86"/>
+        <source>Upload</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
         <translation type="unfinished">Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
         <translation type="unfinished">Peso</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="460"/>
+        <source>Clicking here will remove this weigthsystem.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
- &gt; Month</source>
+ &gt; Month / Trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
         <translation type="unfinished">#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1307"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1310"/>
+        <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1311"/>
+        <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1312"/>
-        <location filename="../qt-ui/models.cpp" line="1315"/>
-        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <location filename="../qt-ui/models.cpp" line="1418"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1313"/>
-        <location filename="../qt-ui/models.cpp" line="1316"/>
-        <location filename="../qt-ui/models.cpp" line="1319"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"></translation>
@@ -3740,91 +4113,74 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="44"/>
+        <location filename="../dive.c" line="57"/>
         <source>pascal</source>
         <translation type="unfinished">pascal</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="48"/>
-        <location filename="../qt-gui.cpp" line="323"/>
+        <location filename="../dive.c" line="61"/>
+        <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
         <translation type="unfinished">bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="52"/>
-        <location filename="../qt-gui.cpp" line="326"/>
+        <location filename="../dive.c" line="65"/>
+        <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
         <translation type="unfinished">psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="88"/>
-        <location filename="../qt-gui.cpp" line="304"/>
+        <location filename="../dive.c" line="101"/>
+        <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
         <translation type="unfinished">l</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="93"/>
-        <location filename="../qt-gui.cpp" line="307"/>
+        <location filename="../dive.c" line="106"/>
+        <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
         <translation type="unfinished">piedi cubi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="121"/>
-        <location filename="../qt-gui.cpp" line="207"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
         <translation type="unfinished">m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="126"/>
-        <location filename="../qt-gui.cpp" line="210"/>
+        <location filename="../dive.c" line="139"/>
+        <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
         <translation type="unfinished">ft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="170"/>
-        <location filename="../qt-gui.cpp" line="233"/>
+        <location filename="../dive.c" line="183"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
         <translation type="unfinished">lbs</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
-        <location filename="../qt-gui.cpp" line="231"/>
+        <location filename="../dive.c" line="187"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="966"/>
+        <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
         <translation type="unfinished">(%s) oder (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="473"/>
         <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <translation type="unfinished">%1$s %3$d. %2$s %4$d %5$02d:%6$02d</translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="490"/>
-        <source>%1$s %2$d, %3$d
-%4$02d:%5$02d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="512"/>
-        <source>%1$s %2$d (%3$d dives)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="519"/>
-        <source>%1$s %2$d (1 dive)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">%1$s %3$d. %2$s %4$d %5$02d:%6$02d</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="550"/>
-        <location filename="../planner.c" line="94"/>
-        <location filename="../planner.c" line="748"/>
-        <location filename="../planner.c" line="749"/>
-        <location filename="../statistics.c" line="360"/>
-        <location filename="../statistics.c" line="371"/>
+        <location filename="../divelist.c" line="488"/>
+        <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"/>
         <source>air</source>
         <translation type="unfinished">aria</translation>
     </message>
@@ -3854,241 +4210,255 @@ Maximum</source>
         <translation type="unfinished">clip-on</translation>
     </message>
     <message>
-        <location filename="../file.c" line="106"/>
-        <location filename="../file.c" line="108"/>
-        <location filename="../file.c" line="303"/>
-        <location filename="../file.c" line="305"/>
+        <location filename="../file.c" line="107"/>
+        <location filename="../file.c" line="109"/>
+        <location filename="../file.c" line="308"/>
+        <location filename="../file.c" line="310"/>
+        <location filename="../file.c" line="390"/>
+        <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation type="unfinished">Impossibile leggere &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <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>
+    </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>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
         <translation type="unfinished">nessuno</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
         <translation type="unfinished">deco stop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
         <translation type="unfinished">risalita</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
         <translation type="unfinished">ceiling</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
         <translation type="unfinished">carico di lavoro</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
         <translation type="unfinished">trasmettitore</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
         <translation type="unfinished">violazione</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
         <translation type="unfinished">segnalibro</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
         <translation type="unfinished">superficie</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
         <translation type="unfinished">sosta di sicurezza</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
         <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
         <translation type="unfinished">cambio gas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
         <translation type="unfinished">sosta di sicurezza (facoltativa)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
         <translation type="unfinished">sosta di sicurezza (obbligatoria)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
         <translation type="unfinished">deepstop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
         <translation type="unfinished">ceiling (sosta di sicurezza)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
         <translation type="unfinished">durata immersione</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
         <translation type="unfinished">profondità massima</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
         <translation type="unfinished">PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
         <translation type="unfinished">tempo in aria</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
         <translation type="unfinished">rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
         <translation type="unfinished">intestazione</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
         <translation type="unfinished">avviso del livello dei tessuti</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
         <translation type="unfinished">tempo di non stop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="157"/>
+        <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
         <translation type="unfinished">numero evento non valido</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="390"/>
+        <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
         <translation type="unfinished">Impossibile creare un parser per %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="396"/>
+        <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
         <translation type="unfinished">Errore registrando la data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="405"/>
+        <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
         <translation type="unfinished">Errore analizzando la data/il tempo</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
         <translation type="unfinished">Immersione #%d: %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="427"/>
+        <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
         <translation type="unfinished">Errore analizzando il tempo di immersione</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="437"/>
+        <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
         <translation type="unfinished">Errore analizzando la profondità massima</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="447"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
         <translation type="unfinished">Errore analizzando il conteggio della miscela di gas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
         <translation type="unfinished">Errore nell&apos;ottenimento della salinità dell&apos;acqua</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="469"/>
+        <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
         <translation type="unfinished">Errore analizzando la miscela di gas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
         <translation type="unfinished">Errore analizzando i campioni</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="613"/>
+        <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
         <translation type="unfinished">Evento: in attesa dell&apos; azione dell&apos;utente.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="621"/>
+        <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation type="unfinished">modello=%u (0x%08x), firmware=%u (0x%08x), numero di serie=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="663"/>
+        <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
         <translation type="unfinished">Errore registrando il gestore degli eventi.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="668"/>
+        <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished">Errore registrando il gestore della cancellazione.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="672"/>
+        <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
         <translation type="unfinished">Errore importazione dati immersione</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="690"/>
+        <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished">Impossibile aprire %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="549"/>
+        <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
         <translation type="unfinished">Lettura di strane percentuali %s
@@ -4096,68 +4466,66 @@ Maximum</source>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1695"/>
+        <location filename="../parse-xml.c" line="1717"/>
         <source>Failed to parse &apos;%s&apos;.
 </source>
         <translation type="unfinished">Impossibile analizzare &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1696"/>
+        <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation type="unfinished">Impossibile analizzare  &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1894"/>
+        <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1929"/>
+        <location filename="../parse-xml.c" line="1951"/>
         <source>Database connection failed &apos;%s&apos;.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1936"/>
+        <location filename="../parse-xml.c" line="1958"/>
         <source>Database query failed &apos;%s&apos;.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2048"/>
+        <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
         <translation type="unfinished">Non posso aprire il foglio di calcolo  (%s)/%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="96"/>
-        <location filename="../statistics.c" line="363"/>
+        <location filename="../planner.c" line="98"/>
+        <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
         <translation type="unfinished">EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="131"/>
+        <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation type="unfinished">Non trovo il gas %d/%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="192"/>
         <source>Cylinder for planning</source>
-        <translation type="unfinished">Bombola per la pianificazione</translation>
+        <translation type="obsolete">Bombola per la pianificazione</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="217"/>
         <source>Simulated Dive</source>
-        <translation type="unfinished">Immersione simulata</translation>
+        <translation type="obsolete">Immersione simulata</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="294"/>
+        <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
         <translation type="unfinished">Troppe miscele gas</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="472"/>
+        <location filename="../planner.c" line="493"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -4166,166 +4534,159 @@ based on GFlow = %.0f and GFhigh = %.0f
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="513"/>
+        <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="522"/>
+        <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished">Fermati a %.*f %s per %d:%02d min - tempo trascorso %d:%02u su %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
         <translation type="unfinished">Cambiare gas a %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
         <translation type="unfinished">Consumo gas:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="552"/>
+        <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
         <translation type="unfinished">%.0f%s di %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="776"/>
         <source>ean</source>
         <translation type="unfinished">ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1154"/>
         <source>D:%.1f %s</source>
-        <translation type="unfinished">D:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1158"/>
-        <source>%s
-T:%d:%02d</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">D:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
         <translation type="unfinished">%s
 P:%d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
         <translation type="unfinished">%s⏎ T:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1177"/>
+        <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1189"/>
+        <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation type="unfinished">%s⏎ Sosta di sicurezza:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1199"/>
+        <source>@:%d:%02d
+D:%.1f %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1219"/>
+        <source>%s
+SAC:%2.1fl/min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation type="unfinished">%s⏎ Sosta di sicurezza:tempo sconosciuto @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation type="unfinished">%s⏎ Deco:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1211"/>
+        <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation type="unfinished">%s⏎ Deco:tempo sconosciuto @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1217"/>
+        <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
         <translation type="unfinished">%s⏎ In decompressione</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
-        <source>%s
-NDL:-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1275"/>
         <source>%s
 NDL:%umin</source>
         <translation type="unfinished">%s⏎ NDL:%umin</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
-        <source>%s
-TTS:%umin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1223"/>
         <source>%s
 CNS:%u%%</source>
         <translation type="unfinished">%s⏎ CNS:%u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1227"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation type="unfinished">%s⏎ pO%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1231"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation type="unfinished">%s⏎ pN%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1243"/>
+        <location filename="../profile.c" line="1235"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation type="unfinished">%s⏎ pHe:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1240"/>
         <source>%s
 MOD:%d%s</source>
         <translation type="unfinished">%s⏎ MOD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1247"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -4336,295 +4697,330 @@ END:%d%s
 EADD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1349"/>
+        <location filename="../profile.c" line="1280"/>
+        <source>%s
+Deco:%umin @ %.0f %s (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1289"/>
+        <source>%s
+In deco (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>%s
+NDL:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1296"/>
+        <source>%s
+TTS:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
-        <location filename="../profile.c" line="1357"/>
+        <location filename="../profile.c" line="1409"/>
+        <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1361"/>
+        <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1365"/>
+        <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1369"/>
-        <source>%s%sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1425"/>
+        <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1373"/>
-        <location filename="../profile.c" line="1377"/>
-        <source>%s %sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1429"/>
+        <location filename="../profile.c" line="1433"/>
+        <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1384"/>
+        <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="284"/>
+        <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="288"/>
+        <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
-        <source>invalid</source>
+        <location filename="../qt-gui.cpp" line="460"/>
+        <source>%1, %2 %3, %4 %5:%6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../qt-gui.cpp" line="473"/>
+        <source>%1 %2, %3
+%4:%5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="486"/>
+        <source>%1 %2 (%3 dives)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="491"/>
+        <source>%1 %2 (1 dive)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="13"/>
         <source>boat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>shore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>drift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>deep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>cavern</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="14"/>
         <source>ice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>wreck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>cave</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>altitude</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>pool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>lake</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="16"/>
         <source>river</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="17"/>
         <source>night</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
-        <source>freshwater</source>
+        <location filename="../dive.c" line="17"/>
+        <source>fresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
-        <source>training</source>
+        <location filename="../dive.c" line="17"/>
+        <source>student</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
-        <source>teaching</source>
+        <location filename="../dive.c" line="18"/>
+        <source>photo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
-        <source>photo</source>
+        <location filename="../dive.c" line="18"/>
+        <source>video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
-        <source>video</source>
+        <location filename="../dive.c" line="18"/>
+        <source>instructor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="19"/>
         <source>deco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="199"/>
+        <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
         <translation type="unfinished">più di %d giorni</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="205"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation type="unfinished">%dt %dst %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="207"/>
+        <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
         <translation type="unfinished">%dst %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="218"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation type="unfinished">per l&apos;immersione #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="225"/>
+        <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
         <translation type="unfinished">per le immersioni selezionate</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="260"/>
+        <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
         <translation type="unfinished">per l&apos;immersione #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="262"/>
+        <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
         <translation type="unfinished">per l&apos;immersione selezionata</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="264"/>
+        <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
         <translation type="unfinished">per tutte le immersioni</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="266"/>
+        <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
         <translation type="unfinished">(nessuna immersione)</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="363"/>
-        <source>, EAN%d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
         <translation type="unfinished">Dom</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
         <translation type="unfinished">Lun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
         <translation type="unfinished">Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
         <translation type="unfinished">Mer</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
         <translation type="unfinished">Gio</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
         <translation type="unfinished">Ven</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
         <translation type="unfinished">Sab</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
         <translation type="unfinished">Gen</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
         <translation type="unfinished">Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
         <translation type="unfinished">Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
         <translation type="unfinished">Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
         <translation type="unfinished">Mag</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
         <translation type="unfinished">Giu</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
         <translation type="unfinished">Lug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
         <translation type="unfinished">Ago</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
         <translation type="unfinished">Set</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
         <translation type="unfinished">Ott</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
         <translation type="unfinished">Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
         <translation type="unfinished">Dic</translation>
     </message>
diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts
index 83e4bcb0c..f2f39ac4d 100644
--- a/translations/subsurface_nb_NO.ts
+++ b/translations/subsurface_nb_NO.ts
@@ -2313,42 +2313,135 @@ tranlators here
     </message>
 </context>
 <context>
+    <name>CSVImportDialog</name>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <source>Import File (CSV)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <source>Field Separator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <source>Field Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <source>Time</source>
+        <translation type="unfinished">Tid</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <source>Depth</source>
+        <translation type="unfinished">Dybde</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <source>Temp</source>
+        <translation type="unfinished">Temp</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
+        <source>Po2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <source>Cns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <source>Stopdepth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <source>Pre-configured imports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>Open CSV Log File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>CSV Files (*.csv)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
         <translation type="unfinished">Type</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
         <translation type="unfinished">Størrelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="65"/>
+        <source>Switch at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="163"/>
+        <source>Clicking here will remove this cylinder.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="385"/>
+        <source>Cylinder cannot be removed</source>
+        <translation type="unfinished"></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>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
@@ -2372,30 +2465,35 @@ tranlators here
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Device ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Model</source>
         <translation type="unfinished">Modell</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
         <translation type="unfinished">Navn</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <source>Clicking here will remove this divecomputer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1009"/>
+        <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1011"/>
+        <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2403,186 +2501,206 @@ tranlators here
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="39"/>
+        <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="398"/>
+        <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="399"/>
+        <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="400"/>
-        <source>collapse</source>
+        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <source>collapse others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="402"/>
-        <source>remove dive from trip</source>
+        <location filename="../qt-ui/divelistview.cpp" line="638"/>
+        <source>remove dive(s) from trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="405"/>
-        <source>Merge trip with trip above</source>
-        <translation type="unfinished">Slå samme tur med turen over</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="639"/>
+        <source>create new trip above</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="406"/>
-        <source>Merge trip with trip below</source>
-        <translation type="unfinished">Slå sammen tur med turen under</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="640"/>
+        <source>add dive(s) to trip immideately above</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="410"/>
-        <source>delete dive</source>
+        <location filename="../qt-ui/divelistview.cpp" line="643"/>
+        <source>merge trip with trip above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="412"/>
-        <source>merge selected dives</source>
+        <location filename="../qt-ui/divelistview.cpp" line="644"/>
+        <source>merge trip with trip below</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../qt-ui/divelistview.cpp" line="648"/>
+        <source>delete dive(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
-        <source>Bottom SAC</source>
+        <location filename="../qt-ui/divelistview.cpp" line="652"/>
+        <source>save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
-        <source>High GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="653"/>
+        <source>export As UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
-        <source>SAC on DECO Stop</source>
+        <location filename="../qt-ui/divelistview.cpp" line="654"/>
+        <source>shift times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
-        <source>Low GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
+        <source>Save Dives As...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="114"/>
-        <source>Last Stop at 6m</source>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
+        <source>Save File as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="141"/>
-        <source>Start Time</source>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="148"/>
-        <source>ATM Pressure</source>
+        <source>Merge trip with trip above</source>
+        <translation type="obsolete">Slå samme tur med turen over</translation>
+    </message>
+    <message>
+        <source>Merge trip with trip below</source>
+        <translation type="obsolete">Slå sammen tur med turen under</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <source>merge selected dives</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DivePlannerGraphics</name>
+    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="143"/>
-        <source>10m</source>
+        <location filename="../qt-ui/diveplanner.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="145"/>
-        <source>30ft</source>
+        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <source>Bottom SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="146"/>
-        <source>Increase maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <source>SAC on DECO Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="147"/>
-        <source>Decreases maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <source>Increase minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>10min</source>
+        <location filename="../qt-ui/diveplanner.ui" line="108"/>
+        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>Decreases minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <source>Last Stop at 6m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
-        <source>Handler Position Error</source>
+        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="386"/>
-        <source>One or more of your stops will be lost with this operations, 
-Please, remove them first.</source>
+        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <source>ATM Pressure</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DivePlannerGraphics</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <source>10m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="136"/>
+        <source>30ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <source>Handler Position Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="415"/>
-        <source>Air</source>
+        <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>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="420"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="421"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="424"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="425"/>
-        <source>Air</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <source>AIR</source>
+        <translation type="unfinished">Luft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="986"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="987"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
         <translation type="unfinished">Varighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="988"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="989"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1141"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1142"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2590,75 +2708,85 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="851"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="937"/>
+        <source>Available Gases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <source>add dive data point</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1051"/>
+        <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
         <translation type="unfinished">#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1052"/>
+        <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
         <translation type="unfinished">Dato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
         <translation type="unfinished">m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
         <translation type="unfinished">ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1055"/>
+        <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
         <translation type="unfinished">Min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
         <translation type="unfinished">pund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1058"/>
+        <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
         <translation type="unfinished">Drakt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1059"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
         <translation type="unfinished">Flaske</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1061"/>
+        <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
         <translation type="unfinished">SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1062"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1063"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
         <translation type="unfinished">maks CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1064"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
         <translation type="unfinished">Sted</translation>
     </message>
@@ -2666,14 +2794,20 @@ Please, remove them first.</source>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="138"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
         <translation type="unfinished">Feil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="142"/>
-        <source>retry</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
+        <source>Retry</source>
+        <translation type="unfinished">Prøv igjen</translation>
     </message>
 </context>
 <context>
@@ -2733,6 +2867,7 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
         <translation type="unfinished">Dykk</translation>
     </message>
@@ -2747,225 +2882,238 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <source>M/d/yy h:mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="108"/>
-        <location filename="../qt-ui/maintab.cpp" line="307"/>
+        <location filename="../qt-ui/maintab.ui" line="112"/>
+        <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
         <translation type="unfinished">Sted</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="122"/>
+        <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="136"/>
+        <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
         <translation type="unfinished">Dykkeleder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="143"/>
+        <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
         <translation type="unfinished">Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="166"/>
+        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
         <translation type="unfinished">Vurdering</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="173"/>
+        <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
         <translation type="unfinished">Sikt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="182"/>
+        <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
         <translation type="unfinished">Drakt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="206"/>
-        <location filename="../qt-ui/maintab.cpp" line="308"/>
+        <location filename="../qt-ui/maintab.ui" line="217"/>
+        <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
         <translation type="unfinished">Notater</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="232"/>
+        <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
         <translation type="unfinished">Utstyr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="319"/>
+        <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
         <translation type="unfinished">Informasjon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="361"/>
+        <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
         <translation type="unfinished">Dato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="380"/>
+        <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="399"/>
+        <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="418"/>
+        <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="437"/>
-        <location filename="../qt-ui/maintab.ui" line="692"/>
+        <location filename="../qt-ui/maintab.ui" line="466"/>
+        <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
         <translation type="unfinished">SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="456"/>
+        <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="475"/>
+        <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="494"/>
+        <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="513"/>
+        <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="532"/>
+        <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="551"/>
+        <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="570"/>
+        <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
         <translation type="unfinished">Starttid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="589"/>
+        <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
         <translation type="unfinished">Statistikk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="668"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation type="unfinished">Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="680"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation type="unfinished">Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="704"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation type="unfinished">Varighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="716"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation type="unfinished">Total tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="735"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation type="unfinished">Dykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="68"/>
+        <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
         <translation type="unfinished">Flasker</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="129"/>
-        <location filename="../qt-ui/maintab.cpp" line="131"/>
-        <source>This trip is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <source>Trip Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="137"/>
-        <location filename="../qt-ui/maintab.cpp" line="139"/>
-        <source>This dive is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="296"/>
+        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <source>Trip Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="286"/>
-        <source>Trip Location</source>
+        <location filename="../qt-ui/maintab.cpp" line="134"/>
+        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="288"/>
-        <source>Trip Notes</source>
+        <location filename="../qt-ui/maintab.cpp" line="143"/>
+        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
-        <location filename="../qt-ui/maintab.cpp" line="337"/>
-        <location filename="../qt-ui/maintab.cpp" line="338"/>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="146"/>
+        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <source>This dive is being edited. Select Save or Cancel when done.</source>
+        <translation type="unfinished"></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"/>
         <source>/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <source>unknown</source>
+        <translation type="unfinished">ukjent</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
         <translation type="unfinished">N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
         <translation type="unfinished">S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
         <translation type="unfinished">Ø</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
         <translation type="unfinished">V</translation>
     </message>
@@ -2978,308 +3126,432 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="177"/>
         <source>File</source>
-        <translation type="unfinished">Fil</translation>
+        <translation type="obsolete">Fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="196"/>
         <source>Log</source>
-        <translation type="unfinished">Logg</translation>
+        <translation type="obsolete">Logg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="211"/>
         <source>View</source>
-        <translation type="unfinished">Vis</translation>
+        <translation type="obsolete">Vis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="226"/>
+        <location filename="../qt-ui/mainwindow.ui" line="218"/>
         <source>Filter</source>
         <translation type="unfinished">Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="232"/>
         <source>Help</source>
-        <translation type="unfinished">Hjelp</translation>
+        <translation type="obsolete">Hjelp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="245"/>
+        <location filename="../qt-ui/mainwindow.ui" line="177"/>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <source>&amp;Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <source>&amp;View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <source>&amp;Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>&amp;New logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
         <translation type="unfinished">Ny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <source>&amp;Open logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="256"/>
+        <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
+        <location filename="../qt-ui/mainwindow.ui" line="281"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation type="unfinished">Lagre som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
+        <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="277"/>
+        <location filename="../qt-ui/mainwindow.ui" line="292"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation type="unfinished">Lukk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="285"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="176"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <source>Export UDDF</source>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <source>Export &amp;UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
-        <source>Print</source>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <source>Ctrl+U</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="301"/>
-        <source>Ctrl+P</source>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <source>&amp;Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
-        <source>Preferences</source>
-        <translation type="unfinished">Valg</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <source>Ctrl+,</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="311"/>
-        <source>Quit</source>
-        <translation type="unfinished">Avslutt</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
-        <source>Ctrl+Q</source>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <source>Import from &amp;dive computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <source>Download from Dive computer</source>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
-        <source>Ctrl+D</source>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <source>Ctrl+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="327"/>
-        <source>Download from Web Service</source>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <source>&amp;Edit Device Names</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="332"/>
-        <source>Edit Device Names</source>
-        <translation type="unfinished">Rediger enhetsnavn</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <source>Ctrl++</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="337"/>
-        <source>Add Dive</source>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <source>&amp;Renumber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
-        <source>Renumber</source>
-        <translation type="unfinished">Oppdater nummerering</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Ctrl+R</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
-        <source>Auto Group</source>
+        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <source>Toggle &amp;Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
-        <source>Toggle Zoom</source>
-        <translation type="unfinished">Zoom av/på</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <source>&amp;Yearly Statistics</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
-        <source>Yearly Statistics</source>
-        <translation type="unfinished">Årsstatistikk</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <source>Ctrl+Y</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
-        <source>View List</source>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Dive List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="365"/>
-        <source>Ctrl+2</source>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <source>Profile</source>
+        <translation type="unfinished">Profil</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <source>Info</source>
+        <translation type="unfinished">Info</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
-        <source>View Profile</source>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <source>User &amp;Manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="373"/>
-        <source>Ctrl+3</source>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <source>Globe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
-        <source>View Info</source>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <source>P&amp;lan Dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="381"/>
-        <source>Ctrl+4</source>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <source>Ctrl+L</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <source>Import CSV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <source>Import CS&amp;V</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <source>Import from Divelogs.de</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <source>Preferences</source>
+        <translation type="unfinished">Valg</translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="obsolete">Avslutt</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <source>Ctrl+D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Device Names</source>
+        <translation type="obsolete">Rediger enhetsnavn</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <source>Add Dive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Renumber</source>
+        <translation type="obsolete">Oppdater nummerering</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/mainwindow.ui" line="386"/>
-        <source>View All</source>
+        <source>Auto Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="389"/>
+        <source>Toggle Zoom</source>
+        <translation type="obsolete">Zoom av/på</translation>
+    </message>
+    <message>
+        <source>Yearly Statistics</source>
+        <translation type="obsolete">Årsstatistikk</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <source>Ctrl+2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <source>Ctrl+3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <source>Ctrl+4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>Ctrl+1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Prev DC</source>
         <translation type="unfinished">Forrige DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
+        <location filename="../qt-ui/mainwindow.ui" line="439"/>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="402"/>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Next DC</source>
         <translation type="unfinished">Neste DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="405"/>
+        <location filename="../qt-ui/mainwindow.ui" line="447"/>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="410"/>
+        <location filename="../qt-ui/mainwindow.ui" line="452"/>
         <source>Select Events</source>
         <translation type="unfinished">Velg hendelser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
         <source>Input Plan</source>
         <translation type="unfinished">Legg inn plan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
         <source>About Subsurface</source>
         <translation type="unfinished">Om Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>User Manual</source>
-        <translation type="unfinished">Brukermanual</translation>
+        <translation type="obsolete">Brukermanual</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>F1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="433"/>
-        <source>View Globe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="478"/>
         <source>Ctrl+5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="441"/>
-        <source>Dive Planner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="108"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Open File</source>
         <translation type="unfinished">Åpne fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="271"/>
-        <source>manually added dive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="448"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="450"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="455"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
         <translation type="unfinished">Lagre endringer?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="456"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="695"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="696"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="144"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="250"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="286"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="197"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3342,215 +3614,235 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="218"/>
+        <location filename="../qt-ui/preferences.ui" line="199"/>
+        <source>Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="205"/>
+        <source>Use Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="225"/>
+        <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="235"/>
+        <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="245"/>
+        <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="269"/>
+        <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
         <translation type="unfinished">Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="276"/>
+        <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
         <translation type="unfinished">meter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="286"/>
+        <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
         <translation type="unfinished">fot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
         <translation type="unfinished">Trykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="303"/>
+        <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
         <translation type="unfinished">bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="313"/>
+        <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="330"/>
+        <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
         <translation type="unfinished">liter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="340"/>
+        <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
         <translation type="unfinished">ft³</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="350"/>
+        <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
         <translation type="unfinished">Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="357"/>
+        <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
         <translation type="unfinished">celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
         <translation type="unfinished">fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="377"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
         <translation type="unfinished">Vekt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
         <translation type="unfinished">pund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="464"/>
+        <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="472"/>
+        <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="495"/>
-        <location filename="../qt-ui/preferences.ui" line="536"/>
-        <location filename="../qt-ui/preferences.ui" line="577"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="513"/>
+        <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="554"/>
+        <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="595"/>
+        <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="618"/>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="634"/>
+        <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="643"/>
+        <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="666"/>
+        <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="677"/>
+        <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="700"/>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="710"/>
+        <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="721"/>
-        <source>Show time</source>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
+        <source>Calculate NDL/TTS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="733"/>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>Show SAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
+        <source>GFLow at max depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="739"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
-        <source>XML Files (*.xml)</source>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3688,51 +3980,86 @@ Please, remove them first.</source>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="257"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="259"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <source>Hide events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <source>Hide all %1 events?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <source>Remove the selected event?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <source>%1 @ %2:%3</source>
+        <translation type="unfinished"></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>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="337"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="383"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="384"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="582"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="850"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <source>Measure properties of dive segments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
+        <source>Scale your dive to screen size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
+        <source>Edit</source>
+        <translation type="unfinished">Rediger</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
         <translation type="unfinished">luft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="584"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="851"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="859"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
         <translation type="unfinished">Bytter til OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="861"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished"> start</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="862"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished"> slutt</translation>
@@ -3741,62 +4068,62 @@ Please, remove them first.</source>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1497"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
         <translation type="unfinished">ukjent</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1502"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1505"/>
+        <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1512"/>
+        <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1517"/>
+        <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
         <translation type="unfinished">Flaske</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1519"/>
+        <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
         <translation type="unfinished">Gassmiks</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1547"/>
+        <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
         <translation type="unfinished">SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1549"/>
+        <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
         <translation type="unfinished">Maks CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1551"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1564"/>
+        <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1570"/>
+        <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3805,30 +4132,30 @@ Please, remove them first.</source>
     <name>QObject</name>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="44"/>
         <source>AIR</source>
         <translation type="unfinished">Luft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="38"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="45"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="723"/>
+        <source>Remove this Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>EAN32</source>
-        <translation type="unfinished">EAN32</translation>
+        <translation type="obsolete">EAN32</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="46"/>
         <source>EAN36</source>
-        <translation type="unfinished">EAN36</translation>
+        <translation type="obsolete">EAN36</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="47"/>
-        <source>Choose Gas</source>
+        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <source>No location data - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="188"/>
-        <source>No location data - move the map and double-click to set the dive location</source>
+        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3837,17 +4164,17 @@ Please, remove them first.</source>
         <translation type="unfinished">Lukk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="26"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation type="unfinished">Gjennomsnitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="29"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation type="unfinished">Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation type="unfinished">Maksimum</translation>
     </message>
@@ -3866,92 +4193,95 @@ Please, remove them first.</source>
     </message>
 </context>
 <context>
-    <name>SubsurfaceAbout</name>
+    <name>ShiftTimesDialog</name>
     <message>
-        <location filename="../qt-ui/about.ui" line="23"/>
-        <source>About Subsurface</source>
-        <translation type="unfinished">Om Subsurface</translation>
+        <location filename="../qt-ui/shifttimes.ui" line="14"/>
+        <source>Shift selected times</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
+        <location filename="../qt-ui/shifttimes.ui" line="35"/>
+        <source>Shift times of selected dives by</source>
         <translation type="unfinished"></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>
+        <location filename="../qt-ui/shifttimes.ui" line="80"/>
+        <source>h:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="22"/>
-        <source>&amp;License</source>
+        <location filename="../qt-ui/shifttimes.ui" line="90"/>
+        <source>earlier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
-        <source>&amp;Website</source>
+        <location filename="../qt-ui/shifttimes.ui" line="97"/>
+        <source>later</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SubsurfaceWebServices</name>
+    <name>SubsurfaceAbout</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="14"/>
-        <source>Download Location Data</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/about.ui" line="23"/>
+        <source>About Subsurface</source>
+        <translation type="unfinished">Om Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="37"/>
-        <source>Download</source>
+        <location filename="../qt-ui/about.ui" line="64"/>
+        <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="44"/>
-        <source>Enter your ID here</source>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="51"/>
-        <source>User ID</source>
+        <location filename="../qt-ui/about.cpp" line="22"/>
+        <source>&amp;License</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="58"/>
-        <source>Status:</source>
+        <location filename="../qt-ui/about.cpp" line="23"/>
+        <source>&amp;Website</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="49"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
         <translation type="unfinished">Nettjeneste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="90"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="106"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="130"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
         <translation type="unfinished">Feil med forbindelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
         <translation type="unfinished">Ugyldig brukeridentifikator!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
         <translation type="unfinished">Kan ikke lese svar!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="133"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
         <translation type="unfinished">Ferdig å laste ned</translation>
     </message>
@@ -3972,17 +4302,17 @@ Please, remove them first.</source>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Bar</source>
         <translation type="unfinished">bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3990,7 +4320,7 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1393"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3998,96 +4328,139 @@ Please, remove them first.</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>WebServices</name>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="14"/>
+        <source>Download Location Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="20"/>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="27"/>
+        <source>Enter your ID here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="34"/>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="58"/>
+        <source>User ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="72"/>
+        <source>Password</source>
+        <translation type="unfinished">Passord</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="86"/>
+        <source>Upload</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
         <translation type="unfinished">Type</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
         <translation type="unfinished">Vekt</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="460"/>
+        <source>Clicking here will remove this weigthsystem.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
- &gt; Month</source>
+ &gt; Month / Trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
         <translation type="unfinished">#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1307"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1310"/>
+        <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1311"/>
+        <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1312"/>
-        <location filename="../qt-ui/models.cpp" line="1315"/>
-        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <location filename="../qt-ui/models.cpp" line="1418"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1313"/>
-        <location filename="../qt-ui/models.cpp" line="1316"/>
-        <location filename="../qt-ui/models.cpp" line="1319"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"></translation>
@@ -4096,91 +4469,74 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="44"/>
+        <location filename="../dive.c" line="57"/>
         <source>pascal</source>
         <translation type="unfinished">pascal</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="48"/>
-        <location filename="../qt-gui.cpp" line="323"/>
+        <location filename="../dive.c" line="61"/>
+        <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
         <translation type="unfinished">bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="52"/>
-        <location filename="../qt-gui.cpp" line="326"/>
+        <location filename="../dive.c" line="65"/>
+        <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
         <translation type="unfinished">psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="88"/>
-        <location filename="../qt-gui.cpp" line="304"/>
+        <location filename="../dive.c" line="101"/>
+        <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
         <translation type="unfinished">l</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="93"/>
-        <location filename="../qt-gui.cpp" line="307"/>
+        <location filename="../dive.c" line="106"/>
+        <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
         <translation type="unfinished">ft³</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="121"/>
-        <location filename="../qt-gui.cpp" line="207"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
         <translation type="unfinished">m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="126"/>
-        <location filename="../qt-gui.cpp" line="210"/>
+        <location filename="../dive.c" line="139"/>
+        <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
         <translation type="unfinished">ft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="170"/>
-        <location filename="../qt-gui.cpp" line="233"/>
+        <location filename="../dive.c" line="183"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
         <translation type="unfinished">pund</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
-        <location filename="../qt-gui.cpp" line="231"/>
+        <location filename="../dive.c" line="187"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="966"/>
+        <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
         <translation type="unfinished">(%s) eller (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="473"/>
         <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <translation type="unfinished">%1$s. %3$d. %2$s %4$d %5$02d:%6$02d</translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="490"/>
-        <source>%1$s %2$d, %3$d
-%4$02d:%5$02d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="512"/>
-        <source>%1$s %2$d (%3$d dives)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="519"/>
-        <source>%1$s %2$d (1 dive)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">%1$s. %3$d. %2$s %4$d %5$02d:%6$02d</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="550"/>
-        <location filename="../planner.c" line="94"/>
-        <location filename="../planner.c" line="748"/>
-        <location filename="../planner.c" line="749"/>
-        <location filename="../statistics.c" line="360"/>
-        <location filename="../statistics.c" line="371"/>
+        <location filename="../divelist.c" line="488"/>
+        <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"/>
         <source>air</source>
         <translation type="unfinished">luft</translation>
     </message>
@@ -4210,312 +4566,324 @@ Maximum</source>
         <translation type="unfinished">clip-on</translation>
     </message>
     <message>
-        <location filename="../file.c" line="106"/>
-        <location filename="../file.c" line="108"/>
-        <location filename="../file.c" line="303"/>
-        <location filename="../file.c" line="305"/>
+        <location filename="../file.c" line="107"/>
+        <location filename="../file.c" line="109"/>
+        <location filename="../file.c" line="308"/>
+        <location filename="../file.c" line="310"/>
+        <location filename="../file.c" line="390"/>
+        <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation type="unfinished">Kunne ikke åpne &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <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>
+    </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>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
         <translation type="unfinished">ingen</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
         <translation type="unfinished">dekostopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
         <translation type="unfinished">rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
         <translation type="unfinished">oppstigning</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
         <translation type="unfinished">tak</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
         <translation type="unfinished">arbeidsbelastning</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
         <translation type="unfinished">sender</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
         <translation type="unfinished">brudd</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
         <translation type="unfinished">bokmerke</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
         <translation type="unfinished">overflate</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
         <translation type="unfinished">sikkerhetsstopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
         <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
         <translation type="unfinished">gassbytte</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
         <translation type="unfinished">sikkerhetsstopp (frivillig)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
         <translation type="unfinished">sikkerhetsstopp (obligatorisk)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
         <translation type="unfinished">dypstopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
         <translation type="unfinished">tak (sikkerhetsstopp)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
         <translation type="unfinished">dykketid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
         <translation type="unfinished">maksdybde</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
         <translation type="unfinished">OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
         <translation type="unfinished">PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
         <translation type="unfinished">lufttid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
         <translation type="unfinished">rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
         <translation type="unfinished">retning</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
         <translation type="unfinished">Advarsel: nivå i vev</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
         <translation type="unfinished">tid uten stopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="157"/>
+        <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
         <translation type="unfinished">ugyldig hendelsesnummer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="390"/>
+        <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
         <translation type="unfinished">Kunne ikke lage parser for %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="396"/>
+        <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
         <translation type="unfinished">Feil ved registrering av data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="405"/>
+        <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
         <translation type="unfinished">Feil ved lesing av dato</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
         <translation type="unfinished">Dykk #%d: %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="427"/>
+        <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
         <translation type="unfinished">Feil ved lesing av dykketid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="437"/>
+        <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
         <translation type="unfinished">Feil ved lesing av maksdybde</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="447"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
         <translation type="unfinished">Feil ved lesing av gassmiksantall</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
         <translation type="unfinished">Feil ved lesing av salthetsgrad</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="469"/>
+        <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
         <translation type="unfinished">Feil ved lesing av gassmiks</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
         <translation type="unfinished">Feil ved lesing av detaljer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="613"/>
+        <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
         <translation type="unfinished">Hendelse: Venter på bruker</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="621"/>
+        <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation type="unfinished">modell=%u (0x%08x), firmware=%u (0x%08x), serienr=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="663"/>
+        <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
         <translation type="unfinished">Feil ved registrering av hendelseshåndterer.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="668"/>
+        <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished">Feil ved registrering av avbruddshåndterer.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="672"/>
+        <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
         <translation type="unfinished">Feil ved import av dykkedata</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="690"/>
+        <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished">Kunne ikke opprette kontekst for libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished">Fikk ikke åpnet %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="549"/>
+        <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
         <translation type="unfinished">Rar lesing av prosent %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1695"/>
+        <location filename="../parse-xml.c" line="1717"/>
         <source>Failed to parse &apos;%s&apos;.
 </source>
         <translation type="unfinished">Kunne ikke lese &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1696"/>
+        <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation type="unfinished">Kunne ikke lese &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1894"/>
+        <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
         <translation type="unfinished">Databasespørring get_eventes feilet.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1929"/>
+        <location filename="../parse-xml.c" line="1951"/>
         <source>Database connection failed &apos;%s&apos;.
 </source>
         <translation type="unfinished">Databaseforbindelse feiled &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1936"/>
+        <location filename="../parse-xml.c" line="1958"/>
         <source>Database query failed &apos;%s&apos;.
 </source>
         <translation type="unfinished">Databasespørring feilen &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2048"/>
+        <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
         <translation type="unfinished">Kan ikke åpne stilark (%s)/%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="96"/>
-        <location filename="../statistics.c" line="363"/>
+        <location filename="../planner.c" line="98"/>
+        <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
         <translation type="unfinished">EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="131"/>
+        <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation type="unfinished">Finner ikke gassen %d/%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="192"/>
         <source>Cylinder for planning</source>
-        <translation type="unfinished">Tank fra plan</translation>
+        <translation type="obsolete">Tank fra plan</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="217"/>
         <source>Simulated Dive</source>
-        <translation type="unfinished">Simulert dykk</translation>
+        <translation type="obsolete">Simulert dykk</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="294"/>
+        <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
         <translation type="unfinished">For mange gassmikser</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="472"/>
+        <location filename="../planner.c" line="493"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -4528,180 +4896,173 @@ basert på GFlow = %.0f og GFhigh = %.0f
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="513"/>
+        <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished">Overgang til %.*f %s i %d:%02d min - kjøretid %d:%02u på %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="522"/>
+        <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished">Bli ved %.*f %s i %d:%02d min - kjøretid %d:%02u på %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
         <translation type="unfinished">Bytt gass til %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
         <translation type="unfinished">Gasskonsum:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="552"/>
+        <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
         <translation type="unfinished">%.0f%s av %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="776"/>
         <source>ean</source>
         <translation type="unfinished">ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1154"/>
         <source>D:%.1f %s</source>
-        <translation type="unfinished">D:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1158"/>
-        <source>%s
-T:%d:%02d</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">D:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
         <translation type="unfinished">%s
 P:%d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
         <translation type="unfinished">%s
 T:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1177"/>
+        <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation type="unfinished">%s
 Kalkulert tak %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1189"/>
+        <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation type="unfinished">%s
 Sikkerhetsstopp:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1199"/>
+        <source>@:%d:%02d
+D:%.1f %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1219"/>
+        <source>%s
+SAC:%2.1fl/min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation type="unfinished">%s
 Sikkerhetsstopp: ukjent tid @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation type="unfinished">%s
 Deko:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1211"/>
+        <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation type="unfinished">%s
 Deko:ukjent tid @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1217"/>
+        <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
         <translation type="unfinished">%s
 I deko</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
-        <source>%s
-NDL:-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1275"/>
         <source>%s
 NDL:%umin</source>
         <translation type="unfinished">%s
 NDL:%umin</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
-        <source>%s
-TTS:%umin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1223"/>
         <source>%s
 CNS:%u%%</source>
         <translation type="unfinished">%s
 CNS:%u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1227"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation type="unfinished">%s
 pO%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1231"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation type="unfinished">%s
 pN%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1243"/>
+        <location filename="../profile.c" line="1235"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation type="unfinished">%s
 pHe:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1240"/>
         <source>%s
 MOD:%d%s</source>
         <translation type="unfinished">%s
 MOD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1247"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -4712,295 +5073,346 @@ END:%d%s
 EADD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1349"/>
+        <location filename="../profile.c" line="1280"/>
+        <source>%s
+Deco:%umin @ %.0f %s (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1289"/>
+        <source>%s
+In deco (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>%s
+NDL:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1296"/>
+        <source>%s
+TTS:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
-        <location filename="../profile.c" line="1357"/>
+        <location filename="../profile.c" line="1409"/>
+        <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1361"/>
+        <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1365"/>
+        <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1369"/>
-        <source>%s%sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1425"/>
+        <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1373"/>
-        <location filename="../profile.c" line="1377"/>
-        <source>%s %sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1429"/>
+        <location filename="../profile.c" line="1433"/>
+        <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1384"/>
+        <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="284"/>
+        <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="288"/>
+        <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../qt-gui.cpp" line="460"/>
+        <source>%1, %2 %3, %4 %5:%6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="473"/>
+        <source>%1 %2, %3
+%4:%5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="486"/>
+        <source>%1 %2 (%3 dives)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="491"/>
+        <source>%1 %2 (1 dive)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>invalid</source>
-        <translation type="unfinished">ugyldig</translation>
+        <translation type="obsolete">ugyldig</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>boat</source>
         <translation type="unfinished">båt</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>shore</source>
         <translation type="unfinished">landdykk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>drift</source>
         <translation type="unfinished">strømdykk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>deep</source>
         <translation type="unfinished">dypdykk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>cavern</source>
         <translation type="unfinished">hule</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="14"/>
         <source>ice</source>
         <translation type="unfinished">isdykk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>wreck</source>
         <translation type="unfinished">vrakdykk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>cave</source>
         <translation type="unfinished">grotte</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>altitude</source>
         <translation type="unfinished">høydedykk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>pool</source>
         <translation type="unfinished">basseng</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>lake</source>
         <translation type="unfinished">innsjø</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="16"/>
         <source>river</source>
         <translation type="unfinished">elv</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="17"/>
         <source>night</source>
         <translation type="unfinished">nattdykk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="17"/>
+        <source>fresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="17"/>
+        <source>student</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>freshwater</source>
-        <translation type="unfinished">ferskvann</translation>
+        <translation type="obsolete">ferskvann</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
         <source>training</source>
-        <translation type="unfinished">trening</translation>
+        <translation type="obsolete">trening</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
         <source>teaching</source>
-        <translation type="unfinished">undervisning</translation>
+        <translation type="obsolete">undervisning</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
         <source>photo</source>
         <translation type="unfinished">foto</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
         <source>video</source>
         <translation type="unfinished">video</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
+        <source>instructor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="19"/>
         <source>deco</source>
         <translation type="unfinished">deko</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="199"/>
+        <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
         <translation type="unfinished">mer enn %d dager</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="205"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation type="unfinished">%dt %dt %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="207"/>
+        <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
         <translation type="unfinished">%dt %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="218"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation type="unfinished">for dykk #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="225"/>
+        <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
         <translation type="unfinished">for valgte dykk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="260"/>
+        <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
         <translation type="unfinished">for dykk #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="262"/>
+        <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
         <translation type="unfinished">for valgte dykk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="264"/>
+        <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
         <translation type="unfinished">for alle dykk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="266"/>
+        <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
         <translation type="unfinished">(ingen dykk)</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="363"/>
-        <source>, EAN%d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
         <translation type="unfinished">søn</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
         <translation type="unfinished">man</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
         <translation type="unfinished">tir</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
         <translation type="unfinished">ons</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
         <translation type="unfinished">tor</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
         <translation type="unfinished">fre</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
         <translation type="unfinished">lør</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
         <translation type="unfinished">jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
         <translation type="unfinished">feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
         <translation type="unfinished">mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
         <translation type="unfinished">apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
         <translation type="unfinished">mai</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
         <translation type="unfinished">jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
         <translation type="unfinished">jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
         <translation type="unfinished">aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
         <translation type="unfinished">sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
         <translation type="unfinished">okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
         <translation type="unfinished">nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
         <translation type="unfinished">des</translation>
     </message>
diff --git a/translations/subsurface_nl_NL.ts b/translations/subsurface_nl_NL.ts
index d4504f734..518180bc0 100644
--- a/translations/subsurface_nl_NL.ts
+++ b/translations/subsurface_nl_NL.ts
@@ -2314,42 +2314,135 @@ Reinout Hoornweg</translation>
     </message>
 </context>
 <context>
+    <name>CSVImportDialog</name>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <source>Import File (CSV)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <source>Field Separator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <source>Field Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <source>Time</source>
+        <translation type="unfinished">Tijd</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <source>Depth</source>
+        <translation type="unfinished">Diepte</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <source>Temp</source>
+        <translation type="unfinished">Temperatuur</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
+        <source>Po2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <source>Cns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <source>Stopdepth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <source>Pre-configured imports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>Open CSV Log File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>CSV Files (*.csv)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
         <translation type="unfinished">Type</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
         <translation type="unfinished">Grootte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="65"/>
+        <source>Switch at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="163"/>
+        <source>Clicking here will remove this cylinder.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="385"/>
+        <source>Cylinder cannot be removed</source>
+        <translation type="unfinished"></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>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
@@ -2373,30 +2466,35 @@ Reinout Hoornweg</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Device ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Model</source>
         <translation type="unfinished">Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
         <translation type="unfinished">Apparaatnaam</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <source>Clicking here will remove this divecomputer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1009"/>
+        <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1011"/>
+        <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2404,186 +2502,206 @@ Reinout Hoornweg</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="39"/>
+        <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="398"/>
+        <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="399"/>
+        <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="400"/>
-        <source>collapse</source>
+        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <source>collapse others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="402"/>
-        <source>remove dive from trip</source>
+        <location filename="../qt-ui/divelistview.cpp" line="638"/>
+        <source>remove dive(s) from trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="405"/>
-        <source>Merge trip with trip above</source>
-        <translation type="unfinished">Trip met bovenstaande samenvoegen</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="639"/>
+        <source>create new trip above</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="406"/>
-        <source>Merge trip with trip below</source>
-        <translation type="unfinished">Trip met onderstaande samenvoegen</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="640"/>
+        <source>add dive(s) to trip immideately above</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="410"/>
-        <source>delete dive</source>
+        <location filename="../qt-ui/divelistview.cpp" line="643"/>
+        <source>merge trip with trip above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="412"/>
-        <source>merge selected dives</source>
+        <location filename="../qt-ui/divelistview.cpp" line="644"/>
+        <source>merge trip with trip below</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../qt-ui/divelistview.cpp" line="648"/>
+        <source>delete dive(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
-        <source>Bottom SAC</source>
+        <location filename="../qt-ui/divelistview.cpp" line="652"/>
+        <source>save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
-        <source>High GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="653"/>
+        <source>export As UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
-        <source>SAC on DECO Stop</source>
+        <location filename="../qt-ui/divelistview.cpp" line="654"/>
+        <source>shift times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
-        <source>Low GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
+        <source>Save Dives As...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="114"/>
-        <source>Last Stop at 6m</source>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
+        <source>Save File as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="141"/>
-        <source>Start Time</source>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="148"/>
-        <source>ATM Pressure</source>
+        <source>Merge trip with trip above</source>
+        <translation type="obsolete">Trip met bovenstaande samenvoegen</translation>
+    </message>
+    <message>
+        <source>Merge trip with trip below</source>
+        <translation type="obsolete">Trip met onderstaande samenvoegen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <source>merge selected dives</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DivePlannerGraphics</name>
+    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="143"/>
-        <source>10m</source>
+        <location filename="../qt-ui/diveplanner.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="145"/>
-        <source>30ft</source>
+        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <source>Bottom SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="146"/>
-        <source>Increase maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <source>SAC on DECO Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="147"/>
-        <source>Decreases maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <source>Increase minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>10min</source>
+        <location filename="../qt-ui/diveplanner.ui" line="108"/>
+        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>Decreases minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <source>Last Stop at 6m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
-        <source>Handler Position Error</source>
+        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="386"/>
-        <source>One or more of your stops will be lost with this operations, 
-Please, remove them first.</source>
+        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <source>ATM Pressure</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DivePlannerGraphics</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <source>10m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="136"/>
+        <source>30ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <source>Handler Position Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="415"/>
-        <source>Air</source>
+        <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>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="420"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="421"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="424"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="425"/>
-        <source>Air</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <source>AIR</source>
+        <translation type="unfinished">AIR</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="986"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="987"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
         <translation type="unfinished">Duur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="988"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="989"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1141"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1142"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2591,75 +2709,85 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="851"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="937"/>
+        <source>Available Gases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <source>add dive data point</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1051"/>
+        <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
         <translation type="unfinished">Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1052"/>
+        <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
         <translation type="unfinished">Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
         <translation type="unfinished">m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
         <translation type="unfinished">ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1055"/>
+        <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
         <translation type="unfinished">min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
         <translation type="unfinished">US pond</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1058"/>
+        <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
         <translation type="unfinished">Pak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1059"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
         <translation type="unfinished">Fles</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1061"/>
+        <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
         <translation type="unfinished">Gasverbruik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1062"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1063"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
         <translation type="unfinished">max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1064"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
         <translation type="unfinished">Locatie</translation>
     </message>
@@ -2667,14 +2795,20 @@ Please, remove them first.</source>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="138"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
         <translation type="unfinished">Fout</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="142"/>
-        <source>retry</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
+        <source>Retry</source>
+        <translation type="unfinished">Opnieuw</translation>
     </message>
 </context>
 <context>
@@ -2734,6 +2868,7 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
         <translation type="unfinished">Duiknotities</translation>
     </message>
@@ -2748,225 +2883,238 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <source>M/d/yy h:mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="108"/>
-        <location filename="../qt-ui/maintab.cpp" line="307"/>
+        <location filename="../qt-ui/maintab.ui" line="112"/>
+        <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
         <translation type="unfinished">Locatie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="122"/>
+        <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="136"/>
+        <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
         <translation type="unfinished">Duikleider</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="143"/>
+        <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
         <translation type="unfinished">Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="166"/>
+        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
         <translation type="unfinished">Waardering</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="173"/>
+        <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
         <translation type="unfinished">Zicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="182"/>
+        <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
         <translation type="unfinished">Pak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="206"/>
-        <location filename="../qt-ui/maintab.cpp" line="308"/>
+        <location filename="../qt-ui/maintab.ui" line="217"/>
+        <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
         <translation type="unfinished">Notities</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="232"/>
+        <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
         <translation type="unfinished">Uitrusting</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="319"/>
+        <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
         <translation type="unfinished">Duikinformatie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="361"/>
+        <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
         <translation type="unfinished">Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="380"/>
+        <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="399"/>
+        <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="418"/>
+        <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="437"/>
-        <location filename="../qt-ui/maintab.ui" line="692"/>
+        <location filename="../qt-ui/maintab.ui" line="466"/>
+        <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
         <translation type="unfinished">Gasverbruik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="456"/>
+        <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="475"/>
+        <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="494"/>
+        <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="513"/>
+        <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="532"/>
+        <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="551"/>
+        <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="570"/>
+        <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
         <translation type="unfinished">Duiktijd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="589"/>
+        <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
         <translation type="unfinished">Statistieken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="668"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation type="unfinished">Diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="680"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation type="unfinished">Temperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="704"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation type="unfinished">Duur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="716"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation type="unfinished">Totale tijd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="735"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation type="unfinished">Duiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="68"/>
+        <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
         <translation type="unfinished">Flessen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="129"/>
-        <location filename="../qt-ui/maintab.cpp" line="131"/>
-        <source>This trip is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <source>Trip Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="137"/>
-        <location filename="../qt-ui/maintab.cpp" line="139"/>
-        <source>This dive is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="296"/>
+        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <source>Trip Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="286"/>
-        <source>Trip Location</source>
+        <location filename="../qt-ui/maintab.cpp" line="134"/>
+        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="288"/>
-        <source>Trip Notes</source>
+        <location filename="../qt-ui/maintab.cpp" line="143"/>
+        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
-        <location filename="../qt-ui/maintab.cpp" line="337"/>
-        <location filename="../qt-ui/maintab.cpp" line="338"/>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="146"/>
+        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <source>This dive is being edited. Select Save or Cancel when done.</source>
+        <translation type="unfinished"></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"/>
         <source>/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <source>unknown</source>
+        <translation type="unfinished">onbekend</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
         <translation type="unfinished">N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
         <translation type="unfinished">Z</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
         <translation type="unfinished">O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
         <translation type="unfinished">W</translation>
     </message>
@@ -2979,308 +3127,432 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="177"/>
         <source>File</source>
-        <translation type="unfinished">Bestand</translation>
+        <translation type="obsolete">Bestand</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="196"/>
         <source>Log</source>
-        <translation type="unfinished">Log</translation>
+        <translation type="obsolete">Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="211"/>
         <source>View</source>
-        <translation type="unfinished">Weergave</translation>
+        <translation type="obsolete">Weergave</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="226"/>
+        <location filename="../qt-ui/mainwindow.ui" line="218"/>
         <source>Filter</source>
         <translation type="unfinished">Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="232"/>
         <source>Help</source>
-        <translation type="unfinished">Help</translation>
+        <translation type="obsolete">Help</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="177"/>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="245"/>
+        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <source>&amp;Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <source>&amp;View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <source>&amp;Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>&amp;New logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
         <translation type="unfinished">Nieuw</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <source>&amp;Open logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="256"/>
+        <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
+        <location filename="../qt-ui/mainwindow.ui" line="281"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation type="unfinished">Opslaan als...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
+        <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="277"/>
+        <location filename="../qt-ui/mainwindow.ui" line="292"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation type="unfinished">Sluiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="285"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="176"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <source>Export UDDF</source>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <source>Export &amp;UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
-        <source>Print</source>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <source>Ctrl+U</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="301"/>
-        <source>Ctrl+P</source>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <source>&amp;Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
-        <source>Preferences</source>
-        <translation type="unfinished">Instellingen</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <source>Ctrl+,</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="311"/>
-        <source>Quit</source>
-        <translation type="unfinished">Afsluiten</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
-        <source>Ctrl+Q</source>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <source>Import from &amp;dive computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <source>Download from Dive computer</source>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
-        <source>Ctrl+D</source>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <source>Ctrl+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="327"/>
-        <source>Download from Web Service</source>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <source>&amp;Edit Device Names</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="332"/>
-        <source>Edit Device Names</source>
-        <translation type="unfinished">Apparaatnamen bewerken</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <source>Ctrl++</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="337"/>
-        <source>Add Dive</source>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <source>&amp;Renumber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
-        <source>Renumber</source>
-        <translation type="unfinished">Hernummeren</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Ctrl+R</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
-        <source>Auto Group</source>
+        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <source>Toggle &amp;Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
-        <source>Toggle Zoom</source>
-        <translation type="unfinished">Zoom in-/uitschakelen</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <source>&amp;Yearly Statistics</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
-        <source>Yearly Statistics</source>
-        <translation type="unfinished">Jaarlijkse statistieken</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <source>Ctrl+Y</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
-        <source>View List</source>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Dive List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="365"/>
-        <source>Ctrl+2</source>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <source>Profile</source>
+        <translation type="unfinished">Profiel</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <source>Info</source>
+        <translation type="unfinished">Informatie</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
-        <source>View Profile</source>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <source>User &amp;Manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="373"/>
-        <source>Ctrl+3</source>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <source>Globe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
-        <source>View Info</source>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <source>P&amp;lan Dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="381"/>
-        <source>Ctrl+4</source>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <source>Ctrl+L</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <source>Import CSV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <source>Import CS&amp;V</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <source>Import from Divelogs.de</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <source>Preferences</source>
+        <translation type="unfinished">Instellingen</translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="obsolete">Afsluiten</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <source>Ctrl+D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Device Names</source>
+        <translation type="obsolete">Apparaatnamen bewerken</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <source>Add Dive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Renumber</source>
+        <translation type="obsolete">Hernummeren</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/mainwindow.ui" line="386"/>
-        <source>View All</source>
+        <source>Auto Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="389"/>
+        <source>Toggle Zoom</source>
+        <translation type="obsolete">Zoom in-/uitschakelen</translation>
+    </message>
+    <message>
+        <source>Yearly Statistics</source>
+        <translation type="obsolete">Jaarlijkse statistieken</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <source>Ctrl+2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <source>Ctrl+3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <source>Ctrl+4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>Ctrl+1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Prev DC</source>
         <translation type="unfinished">Vorige DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
+        <location filename="../qt-ui/mainwindow.ui" line="439"/>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="402"/>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Next DC</source>
         <translation type="unfinished">Volgende DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="405"/>
+        <location filename="../qt-ui/mainwindow.ui" line="447"/>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="410"/>
+        <location filename="../qt-ui/mainwindow.ui" line="452"/>
         <source>Select Events</source>
         <translation type="unfinished">gebeurtenissen selecteren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
         <source>Input Plan</source>
         <translation type="unfinished">Voer plan in</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
         <source>About Subsurface</source>
         <translation type="unfinished">Over Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>User Manual</source>
-        <translation type="unfinished">Gebruikershandleiding</translation>
+        <translation type="obsolete">Gebruikershandleiding</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>F1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="433"/>
-        <source>View Globe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="478"/>
         <source>Ctrl+5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="441"/>
-        <source>Dive Planner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="108"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Open File</source>
         <translation type="unfinished">Bestand openen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="271"/>
-        <source>manually added dive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="448"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="450"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="455"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
         <translation type="unfinished">Aanpassingen opslaan?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="456"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="695"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="696"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="144"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="250"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="286"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="197"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3343,215 +3615,235 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="218"/>
+        <location filename="../qt-ui/preferences.ui" line="199"/>
+        <source>Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="205"/>
+        <source>Use Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="225"/>
+        <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="235"/>
+        <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="245"/>
+        <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="269"/>
+        <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
         <translation type="unfinished">Diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="276"/>
+        <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
         <translation type="unfinished">meter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="286"/>
+        <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
         <translation type="unfinished">voet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
         <translation type="unfinished">Druk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="303"/>
+        <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
         <translation type="unfinished">bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="313"/>
+        <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="330"/>
+        <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
         <translation type="unfinished">liter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="340"/>
+        <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
         <translation type="unfinished">cuft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="350"/>
+        <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
         <translation type="unfinished">Temperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="357"/>
+        <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
         <translation type="unfinished">celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
         <translation type="unfinished">fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="377"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
         <translation type="unfinished">Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
         <translation type="unfinished">US pond</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="464"/>
+        <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="472"/>
+        <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="495"/>
-        <location filename="../qt-ui/preferences.ui" line="536"/>
-        <location filename="../qt-ui/preferences.ui" line="577"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="513"/>
+        <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="554"/>
+        <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="595"/>
+        <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="618"/>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="634"/>
+        <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="643"/>
+        <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="666"/>
+        <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="677"/>
+        <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="700"/>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="710"/>
+        <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="721"/>
-        <source>Show time</source>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
+        <source>Calculate NDL/TTS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="733"/>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>Show SAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
+        <source>GFLow at max depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="739"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
-        <source>XML Files (*.xml)</source>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3689,51 +3981,86 @@ Please, remove them first.</source>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="257"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="259"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <source>Hide events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <source>Hide all %1 events?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <source>Remove the selected event?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <source>%1 @ %2:%3</source>
+        <translation type="unfinished"></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>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="337"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="383"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="384"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="582"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="850"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <source>Measure properties of dive segments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
+        <source>Scale your dive to screen size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
+        <source>Edit</source>
+        <translation type="unfinished">Bewerken</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
         <translation type="unfinished">lucht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="584"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="851"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="859"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
         <translation type="unfinished">Schakel om naar OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="861"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished"> begin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="862"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished"> eind</translation>
@@ -3742,62 +4069,62 @@ Please, remove them first.</source>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1497"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
         <translation type="unfinished">onbekend</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1502"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1505"/>
+        <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1512"/>
+        <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1517"/>
+        <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
         <translation type="unfinished">Fles</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1519"/>
+        <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
         <translation type="unfinished">Gasmengsel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1547"/>
+        <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
         <translation type="unfinished">Gasverbruik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1549"/>
+        <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
         <translation type="unfinished">Max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1551"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1564"/>
+        <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1570"/>
+        <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3806,30 +4133,30 @@ Please, remove them first.</source>
     <name>QObject</name>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="44"/>
         <source>AIR</source>
         <translation type="unfinished">AIR</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="38"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="45"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="723"/>
+        <source>Remove this Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>EAN32</source>
-        <translation type="unfinished">EAN32</translation>
+        <translation type="obsolete">EAN32</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="46"/>
         <source>EAN36</source>
-        <translation type="unfinished">EAN36</translation>
+        <translation type="obsolete">EAN36</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="47"/>
-        <source>Choose Gas</source>
+        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <source>No location data - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="188"/>
-        <source>No location data - move the map and double-click to set the dive location</source>
+        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3838,17 +4165,17 @@ Please, remove them first.</source>
         <translation type="unfinished">Sluiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="26"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation type="unfinished">Gemiddelde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="29"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation type="unfinished">Kleinste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation type="unfinished">Grootste</translation>
     </message>
@@ -3867,92 +4194,95 @@ Please, remove them first.</source>
     </message>
 </context>
 <context>
-    <name>SubsurfaceAbout</name>
+    <name>ShiftTimesDialog</name>
     <message>
-        <location filename="../qt-ui/about.ui" line="23"/>
-        <source>About Subsurface</source>
-        <translation type="unfinished">Over Subsurface</translation>
+        <location filename="../qt-ui/shifttimes.ui" line="14"/>
+        <source>Shift selected times</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
+        <location filename="../qt-ui/shifttimes.ui" line="35"/>
+        <source>Shift times of selected dives by</source>
         <translation type="unfinished"></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>
+        <location filename="../qt-ui/shifttimes.ui" line="80"/>
+        <source>h:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="22"/>
-        <source>&amp;License</source>
+        <location filename="../qt-ui/shifttimes.ui" line="90"/>
+        <source>earlier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
-        <source>&amp;Website</source>
+        <location filename="../qt-ui/shifttimes.ui" line="97"/>
+        <source>later</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SubsurfaceWebServices</name>
+    <name>SubsurfaceAbout</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="14"/>
-        <source>Download Location Data</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/about.ui" line="23"/>
+        <source>About Subsurface</source>
+        <translation type="unfinished">Over Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="37"/>
-        <source>Download</source>
+        <location filename="../qt-ui/about.ui" line="64"/>
+        <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="44"/>
-        <source>Enter your ID here</source>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="51"/>
-        <source>User ID</source>
+        <location filename="../qt-ui/about.cpp" line="22"/>
+        <source>&amp;License</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="58"/>
-        <source>Status:</source>
+        <location filename="../qt-ui/about.cpp" line="23"/>
+        <source>&amp;Website</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="49"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
         <translation type="unfinished">Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="90"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="106"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="130"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
         <translation type="unfinished">Verbindingsfout:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
         <translation type="unfinished">Ongeldige gebruikersidentificatie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
         <translation type="unfinished">Kan antwoord niet parsen!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="133"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
         <translation type="unfinished">Laden succesvol voltooid!</translation>
     </message>
@@ -3973,17 +4303,17 @@ Please, remove them first.</source>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Bar</source>
         <translation type="unfinished">bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3991,7 +4321,7 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1393"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3999,96 +4329,139 @@ Please, remove them first.</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>WebServices</name>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="14"/>
+        <source>Download Location Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="20"/>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="27"/>
+        <source>Enter your ID here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="34"/>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="58"/>
+        <source>User ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="72"/>
+        <source>Password</source>
+        <translation type="unfinished">Wachtwoord</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="86"/>
+        <source>Upload</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
         <translation type="unfinished">Type</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
         <translation type="unfinished">Gewicht</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="460"/>
+        <source>Clicking here will remove this weigthsystem.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
- &gt; Month</source>
+ &gt; Month / Trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
         <translation type="unfinished">Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1307"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1310"/>
+        <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1311"/>
+        <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1312"/>
-        <location filename="../qt-ui/models.cpp" line="1315"/>
-        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <location filename="../qt-ui/models.cpp" line="1418"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1313"/>
-        <location filename="../qt-ui/models.cpp" line="1316"/>
-        <location filename="../qt-ui/models.cpp" line="1319"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"></translation>
@@ -4097,91 +4470,74 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="44"/>
+        <location filename="../dive.c" line="57"/>
         <source>pascal</source>
         <translation type="unfinished">Pa</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="48"/>
-        <location filename="../qt-gui.cpp" line="323"/>
+        <location filename="../dive.c" line="61"/>
+        <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
         <translation type="unfinished">bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="52"/>
-        <location filename="../qt-gui.cpp" line="326"/>
+        <location filename="../dive.c" line="65"/>
+        <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
         <translation type="unfinished">psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="88"/>
-        <location filename="../qt-gui.cpp" line="304"/>
+        <location filename="../dive.c" line="101"/>
+        <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
         <translation type="unfinished">l</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="93"/>
-        <location filename="../qt-gui.cpp" line="307"/>
+        <location filename="../dive.c" line="106"/>
+        <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
         <translation type="unfinished">cuft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="121"/>
-        <location filename="../qt-gui.cpp" line="207"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
         <translation type="unfinished">m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="126"/>
-        <location filename="../qt-gui.cpp" line="210"/>
+        <location filename="../dive.c" line="139"/>
+        <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
         <translation type="unfinished">ft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="170"/>
-        <location filename="../qt-gui.cpp" line="233"/>
+        <location filename="../dive.c" line="183"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
         <translation type="unfinished">US pond</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
-        <location filename="../qt-gui.cpp" line="231"/>
+        <location filename="../dive.c" line="187"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="966"/>
+        <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
         <translation type="unfinished">(%s) of (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="473"/>
         <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <translation type="unfinished">%1$s %3$d %2$s %4$d %5$02d:%6$02d</translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="490"/>
-        <source>%1$s %2$d, %3$d
-%4$02d:%5$02d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="512"/>
-        <source>%1$s %2$d (%3$d dives)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="519"/>
-        <source>%1$s %2$d (1 dive)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">%1$s %3$d %2$s %4$d %5$02d:%6$02d</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="550"/>
-        <location filename="../planner.c" line="94"/>
-        <location filename="../planner.c" line="748"/>
-        <location filename="../planner.c" line="749"/>
-        <location filename="../statistics.c" line="360"/>
-        <location filename="../statistics.c" line="371"/>
+        <location filename="../divelist.c" line="488"/>
+        <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"/>
         <source>air</source>
         <translation type="unfinished">lucht</translation>
     </message>
@@ -4211,312 +4567,324 @@ Maximum</source>
         <translation type="unfinished">clip-on</translation>
     </message>
     <message>
-        <location filename="../file.c" line="106"/>
-        <location filename="../file.c" line="108"/>
-        <location filename="../file.c" line="303"/>
-        <location filename="../file.c" line="305"/>
+        <location filename="../file.c" line="107"/>
+        <location filename="../file.c" line="109"/>
+        <location filename="../file.c" line="308"/>
+        <location filename="../file.c" line="310"/>
+        <location filename="../file.c" line="390"/>
+        <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation type="unfinished">Fout bij lezen van &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <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>
+    </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>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
         <translation type="unfinished">geen</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
         <translation type="unfinished">decompressiestop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
         <translation type="unfinished">RBT</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
         <translation type="unfinished">opstijging</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
         <translation type="unfinished">plafond</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
         <translation type="unfinished">werklast</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
         <translation type="unfinished">zender</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
         <translation type="unfinished">schending</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
         <translation type="unfinished">bladwijzer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
         <translation type="unfinished">oppervlakte</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
         <translation type="unfinished">veiligheidsstop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
         <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
         <translation type="unfinished">gaswissel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
         <translation type="unfinished">veiligheidsstop (vrijwillig)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
         <translation type="unfinished">veiligheidsstop (verplicht)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
         <translation type="unfinished">diepe stop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
         <translation type="unfinished">plafond (veiligheidsstop)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
         <translation type="unfinished">duiktijd</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
         <translation type="unfinished">Max. diepte</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
         <translation type="unfinished">OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
         <translation type="unfinished">PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
         <translation type="unfinished">resterende luchttijd</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
         <translation type="unfinished">RGBM</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
         <translation type="unfinished">koers</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
         <translation type="unfinished">waarschuwing stikstofbelasting</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
         <translation type="unfinished">nultijd</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="157"/>
+        <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
         <translation type="unfinished">ongeldig event-nummer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="390"/>
+        <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
         <translation type="unfinished">Kan geen parser creëren voor %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="396"/>
+        <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
         <translation type="unfinished">Fout bij het registreren van de data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="405"/>
+        <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
         <translation type="unfinished">Fout bij verwerken van de datum en tijd</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
         <translation type="unfinished">Duik nr. %d: %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="427"/>
+        <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
         <translation type="unfinished">Fout bij verwerken van de duikduur</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="437"/>
+        <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
         <translation type="unfinished">Fout bij het verwerken van de maximum duikdiepte</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="447"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
         <translation type="unfinished">Fout bij het verwerken van het aantal gasmengsels</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
         <translation type="unfinished">Fout bij het verkrijgen van het zoutgehalte</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="469"/>
+        <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
         <translation type="unfinished">Fout bij het verwerken van het gasmengsel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
         <translation type="unfinished">Fout bij het verwerken van de samples</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="613"/>
+        <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
         <translation type="unfinished">Event: wachten op handeling van gebruiker</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="621"/>
+        <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation type="unfinished">model=%u (0x%08x), firmware=%u (0x%08x), serienummer=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="663"/>
+        <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
         <translation type="unfinished">Fout bij het registreren van de event handler.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="668"/>
+        <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished">Fout bij het registreren van de cancellation handler.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="672"/>
+        <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
         <translation type="unfinished">Fout bij importeren van duikdata</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="690"/>
+        <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished">Kan geen context creëren voor libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished">Fout bij openen van  %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="549"/>
+        <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
         <translation type="unfinished">Vreemde percentage %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1695"/>
+        <location filename="../parse-xml.c" line="1717"/>
         <source>Failed to parse &apos;%s&apos;.
 </source>
         <translation type="unfinished">Fout bij analyseren van &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1696"/>
+        <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation type="unfinished">Fout bij analyse van &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1894"/>
+        <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
         <translation type="unfinished">Database-query get_events mislukt.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1929"/>
+        <location filename="../parse-xml.c" line="1951"/>
         <source>Database connection failed &apos;%s&apos;.
 </source>
         <translation type="unfinished">Databaseconnectie is mislukt &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1936"/>
+        <location filename="../parse-xml.c" line="1958"/>
         <source>Database query failed &apos;%s&apos;.
 </source>
         <translation type="unfinished">Database-query mislukt: &apos;%s&apos;
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2048"/>
+        <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
         <translation type="unfinished">Kan stylesheet (%s)/%s niet openen</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="96"/>
-        <location filename="../statistics.c" line="363"/>
+        <location filename="../planner.c" line="98"/>
+        <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
         <translation type="unfinished">EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="131"/>
+        <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation type="unfinished">Kan gasmengsel %d/%d niet vinden</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="192"/>
         <source>Cylinder for planning</source>
-        <translation type="unfinished">Fles voor planning</translation>
+        <translation type="obsolete">Fles voor planning</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="217"/>
         <source>Simulated Dive</source>
-        <translation type="unfinished">Gesimuleerde duik</translation>
+        <translation type="obsolete">Gesimuleerde duik</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="294"/>
+        <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
         <translation type="unfinished">Teveel gasmengsels</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="472"/>
+        <location filename="../planner.c" line="493"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -4529,180 +4897,173 @@ Gebaseerd op GFlow =  %.0f en GFhigh = %.0f
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="513"/>
+        <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished">Ga naar %.*f %s over %d:%02d min - looptijd %d:%02u op %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="522"/>
+        <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished">Blijft op %.*f %s gedurende %d:%02d min - looptijd %d:%02u op %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
         <translation type="unfinished">Gaswissel naar %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
         <translation type="unfinished">Gasverbruik:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="552"/>
+        <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
         <translation type="unfinished">%.0f%s %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="776"/>
         <source>ean</source>
         <translation type="unfinished">EAN</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1154"/>
         <source>D:%.1f %s</source>
-        <translation type="unfinished">D:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1158"/>
-        <source>%s
-T:%d:%02d</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">D:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
         <translation type="unfinished">%s
 P:%d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
         <translation type="unfinished">%s
 T:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1177"/>
+        <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation type="unfinished">%s
 Berekend plafond %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1189"/>
+        <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation type="unfinished">%s
 Veiligheidsstop:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1199"/>
+        <source>@:%d:%02d
+D:%.1f %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1219"/>
+        <source>%s
+SAC:%2.1fl/min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation type="unfinished">%s
 Veiligheidsstop:onbek.tijd @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation type="unfinished">%s
 Deco:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1211"/>
+        <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation type="unfinished">%s
 Deco:onbek.tijd @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1217"/>
+        <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
         <translation type="unfinished">%s
 In deco</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
-        <source>%s
-NDL:-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1275"/>
         <source>%s
 NDL:%umin</source>
         <translation type="unfinished">%s
 NDL:%umin</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
-        <source>%s
-TTS:%umin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1223"/>
         <source>%s
 CNS:%u%%</source>
         <translation type="unfinished">%s
 CNS:%u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1227"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation type="unfinished">%s
 pO%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1231"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation type="unfinished">%s
 pN%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1243"/>
+        <location filename="../profile.c" line="1235"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation type="unfinished">%s
 pHe:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1240"/>
         <source>%s
 MOD:%d%s</source>
         <translation type="unfinished">%s
 MOD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1247"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -4713,295 +5074,346 @@ END:%d%s
 EADD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1349"/>
+        <location filename="../profile.c" line="1280"/>
+        <source>%s
+Deco:%umin @ %.0f %s (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1289"/>
+        <source>%s
+In deco (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>%s
+NDL:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1296"/>
+        <source>%s
+TTS:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
-        <location filename="../profile.c" line="1357"/>
+        <location filename="../profile.c" line="1409"/>
+        <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1361"/>
+        <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1365"/>
+        <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1369"/>
-        <source>%s%sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1425"/>
+        <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1373"/>
-        <location filename="../profile.c" line="1377"/>
-        <source>%s %sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1429"/>
+        <location filename="../profile.c" line="1433"/>
+        <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1384"/>
+        <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="284"/>
+        <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="288"/>
+        <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../qt-gui.cpp" line="460"/>
+        <source>%1, %2 %3, %4 %5:%6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="473"/>
+        <source>%1 %2, %3
+%4:%5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="486"/>
+        <source>%1 %2 (%3 dives)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="491"/>
+        <source>%1 %2 (1 dive)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>invalid</source>
-        <translation type="unfinished">Ongeldig</translation>
+        <translation type="obsolete">Ongeldig</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>boat</source>
         <translation type="unfinished">boot</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>shore</source>
         <translation type="unfinished">kust</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>drift</source>
         <translation type="unfinished">drift</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>deep</source>
         <translation type="unfinished">diep</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>cavern</source>
         <translation type="unfinished">spelonk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="14"/>
         <source>ice</source>
         <translation type="unfinished">ijs</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>wreck</source>
         <translation type="unfinished">wrak</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>cave</source>
         <translation type="unfinished">grot</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>altitude</source>
         <translation type="unfinished">hoogte</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>pool</source>
         <translation type="unfinished">zwembad</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>lake</source>
         <translation type="unfinished">meer</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="16"/>
         <source>river</source>
         <translation type="unfinished">rivier</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="17"/>
         <source>night</source>
         <translation type="unfinished">nacht</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="17"/>
+        <source>fresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="17"/>
+        <source>student</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>freshwater</source>
-        <translation type="unfinished">zoetwater</translation>
+        <translation type="obsolete">zoetwater</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
         <source>training</source>
-        <translation type="unfinished">training</translation>
+        <translation type="obsolete">training</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
         <source>teaching</source>
-        <translation type="unfinished">lesgeven</translation>
+        <translation type="obsolete">lesgeven</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
         <source>photo</source>
         <translation type="unfinished">foto</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
         <source>video</source>
         <translation type="unfinished">video</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
+        <source>instructor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="19"/>
         <source>deco</source>
         <translation type="unfinished">decompressie</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="199"/>
+        <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
         <translation type="unfinished">meer dan %d dagen</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="205"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation type="unfinished">%dd %du %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="207"/>
+        <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
         <translation type="unfinished">%du %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="218"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation type="unfinished">voor duik nr.</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="225"/>
+        <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
         <translation type="unfinished">voor de geselecteerde duiken</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="260"/>
+        <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
         <translation type="unfinished">Voor duik nr. %d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="262"/>
+        <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
         <translation type="unfinished">voor de geselecteerde duik</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="264"/>
+        <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
         <translation type="unfinished">voor alle duiken</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="266"/>
+        <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
         <translation type="unfinished">(geen duiken)</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="363"/>
-        <source>, EAN%d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
         <translation type="unfinished">Zo</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
         <translation type="unfinished">Ma</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
         <translation type="unfinished">Di</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
         <translation type="unfinished">Wo</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
         <translation type="unfinished">Do</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
         <translation type="unfinished">Vr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
         <translation type="unfinished">Za</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
         <translation type="unfinished">jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
         <translation type="unfinished">feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
         <translation type="unfinished">mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
         <translation type="unfinished">apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
         <translation type="unfinished">mei</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
         <translation type="unfinished">jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
         <translation type="unfinished">jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
         <translation type="unfinished">aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
         <translation type="unfinished">sept</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
         <translation type="unfinished">okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
         <translation type="unfinished">nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
         <translation type="unfinished">dec</translation>
     </message>
diff --git a/translations/subsurface_pl_PL.ts b/translations/subsurface_pl_PL.ts
index 74587dd06..007b52b68 100644
--- a/translations/subsurface_pl_PL.ts
+++ b/translations/subsurface_pl_PL.ts
@@ -2315,42 +2315,135 @@ tranlators here
     </message>
 </context>
 <context>
+    <name>CSVImportDialog</name>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <source>Import File (CSV)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <source>Field Separator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <source>Field Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <source>Time</source>
+        <translation type="unfinished">Czas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <source>Depth</source>
+        <translation type="unfinished">Głębokość</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <source>Temp</source>
+        <translation type="unfinished">Temperatura</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
+        <source>Po2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <source>Cns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <source>Stopdepth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <source>Pre-configured imports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>Open CSV Log File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>CSV Files (*.csv)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
         <translation type="unfinished">Rodzaj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
         <translation type="unfinished">Pojemność</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="65"/>
+        <source>Switch at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="163"/>
+        <source>Clicking here will remove this cylinder.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="385"/>
+        <source>Cylinder cannot be removed</source>
+        <translation type="unfinished"></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>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
@@ -2374,30 +2467,35 @@ tranlators here
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Device ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Model</source>
         <translation type="unfinished">Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
         <translation type="unfinished">Nazwa</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <source>Clicking here will remove this divecomputer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1009"/>
+        <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1011"/>
+        <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2405,186 +2503,206 @@ tranlators here
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="39"/>
+        <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="398"/>
+        <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="399"/>
+        <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="400"/>
-        <source>collapse</source>
+        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <source>collapse others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="402"/>
-        <source>remove dive from trip</source>
+        <location filename="../qt-ui/divelistview.cpp" line="638"/>
+        <source>remove dive(s) from trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="405"/>
-        <source>Merge trip with trip above</source>
-        <translation type="unfinished">Połącz grupę z grupą powyżej</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="639"/>
+        <source>create new trip above</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="406"/>
-        <source>Merge trip with trip below</source>
-        <translation type="unfinished">Połącz grupę z grupą poniżej</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="640"/>
+        <source>add dive(s) to trip immideately above</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="410"/>
-        <source>delete dive</source>
+        <location filename="../qt-ui/divelistview.cpp" line="643"/>
+        <source>merge trip with trip above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="412"/>
-        <source>merge selected dives</source>
+        <location filename="../qt-ui/divelistview.cpp" line="644"/>
+        <source>merge trip with trip below</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../qt-ui/divelistview.cpp" line="648"/>
+        <source>delete dive(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
-        <source>Bottom SAC</source>
+        <location filename="../qt-ui/divelistview.cpp" line="652"/>
+        <source>save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
-        <source>High GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="653"/>
+        <source>export As UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
-        <source>SAC on DECO Stop</source>
+        <location filename="../qt-ui/divelistview.cpp" line="654"/>
+        <source>shift times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
-        <source>Low GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
+        <source>Save Dives As...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="114"/>
-        <source>Last Stop at 6m</source>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
+        <source>Save File as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="141"/>
-        <source>Start Time</source>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="148"/>
-        <source>ATM Pressure</source>
+        <source>Merge trip with trip above</source>
+        <translation type="obsolete">Połącz grupę z grupą powyżej</translation>
+    </message>
+    <message>
+        <source>Merge trip with trip below</source>
+        <translation type="obsolete">Połącz grupę z grupą poniżej</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <source>merge selected dives</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DivePlannerGraphics</name>
+    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="143"/>
-        <source>10m</source>
+        <location filename="../qt-ui/diveplanner.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="145"/>
-        <source>30ft</source>
+        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <source>Bottom SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="146"/>
-        <source>Increase maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <source>SAC on DECO Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="147"/>
-        <source>Decreases maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <source>Increase minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>10min</source>
+        <location filename="../qt-ui/diveplanner.ui" line="108"/>
+        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>Decreases minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <source>Last Stop at 6m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
-        <source>Handler Position Error</source>
+        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="386"/>
-        <source>One or more of your stops will be lost with this operations, 
-Please, remove them first.</source>
+        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <source>ATM Pressure</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DivePlannerGraphics</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <source>10m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="136"/>
+        <source>30ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <source>Handler Position Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="415"/>
-        <source>Air</source>
+        <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>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="420"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="421"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="424"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="425"/>
-        <source>Air</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <source>AIR</source>
+        <translation type="unfinished">POWIETRZE</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="986"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="987"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
         <translation type="unfinished">Czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="988"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="989"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1141"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1142"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2592,75 +2710,85 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="851"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="937"/>
+        <source>Available Gases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <source>add dive data point</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1051"/>
+        <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
         <translation type="unfinished">#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1052"/>
+        <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
         <translation type="unfinished">Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
         <translation type="unfinished">m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
         <translation type="unfinished">ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1055"/>
+        <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
         <translation type="unfinished">min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
         <translation type="unfinished">lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1058"/>
+        <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
         <translation type="unfinished">Skafander</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1059"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
         <translation type="unfinished">Butle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1061"/>
+        <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
         <translation type="unfinished">SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1062"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1063"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
         <translation type="unfinished">maxCNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1064"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
         <translation type="unfinished">Miejsce</translation>
     </message>
@@ -2668,14 +2796,20 @@ Please, remove them first.</source>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="138"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
         <translation type="unfinished">Błąd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="142"/>
-        <source>retry</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
+        <source>Retry</source>
+        <translation type="unfinished">Ponów</translation>
     </message>
 </context>
 <context>
@@ -2735,6 +2869,7 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
         <translation type="unfinished">Notatki</translation>
     </message>
@@ -2749,225 +2884,238 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <source>M/d/yy h:mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="108"/>
-        <location filename="../qt-ui/maintab.cpp" line="307"/>
+        <location filename="../qt-ui/maintab.ui" line="112"/>
+        <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
         <translation type="unfinished">Miejsce</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="122"/>
+        <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="136"/>
+        <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
         <translation type="unfinished">Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="143"/>
+        <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
         <translation type="unfinished">Partner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="166"/>
+        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
         <translation type="unfinished">Ocena</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="173"/>
+        <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
         <translation type="unfinished">Widoczność</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="182"/>
+        <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
         <translation type="unfinished">Skafander</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="206"/>
-        <location filename="../qt-ui/maintab.cpp" line="308"/>
+        <location filename="../qt-ui/maintab.ui" line="217"/>
+        <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
         <translation type="unfinished">Notatki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="232"/>
+        <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
         <translation type="unfinished">Wyposażenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="319"/>
+        <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
         <translation type="unfinished">Informacje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="361"/>
+        <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
         <translation type="unfinished">Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="380"/>
+        <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="399"/>
+        <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="418"/>
+        <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="437"/>
-        <location filename="../qt-ui/maintab.ui" line="692"/>
+        <location filename="../qt-ui/maintab.ui" line="466"/>
+        <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
         <translation type="unfinished">SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="456"/>
+        <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="475"/>
+        <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="494"/>
+        <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="513"/>
+        <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="532"/>
+        <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="551"/>
+        <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="570"/>
+        <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
         <translation type="unfinished">Czas nurkowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="589"/>
+        <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
         <translation type="unfinished">Statystyka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="668"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation type="unfinished">Głębokość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="680"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation type="unfinished">Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="704"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation type="unfinished">Czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="716"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation type="unfinished">Całkowity czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="735"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation type="unfinished">Nurkowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="68"/>
+        <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
         <translation type="unfinished">Butle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="129"/>
-        <location filename="../qt-ui/maintab.cpp" line="131"/>
-        <source>This trip is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <source>Trip Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="137"/>
-        <location filename="../qt-ui/maintab.cpp" line="139"/>
-        <source>This dive is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="296"/>
+        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <source>Trip Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="286"/>
-        <source>Trip Location</source>
+        <location filename="../qt-ui/maintab.cpp" line="134"/>
+        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="288"/>
-        <source>Trip Notes</source>
+        <location filename="../qt-ui/maintab.cpp" line="143"/>
+        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
-        <location filename="../qt-ui/maintab.cpp" line="337"/>
-        <location filename="../qt-ui/maintab.cpp" line="338"/>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="146"/>
+        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <source>This dive is being edited. Select Save or Cancel when done.</source>
+        <translation type="unfinished"></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"/>
         <source>/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <source>unknown</source>
+        <translation type="unfinished">nieznana</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
         <translation type="unfinished">N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
         <translation type="unfinished">S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
         <translation type="unfinished">E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
         <translation type="unfinished">W</translation>
     </message>
@@ -2980,308 +3128,432 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="177"/>
         <source>File</source>
-        <translation type="unfinished">Plik</translation>
+        <translation type="obsolete">Plik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="196"/>
         <source>Log</source>
-        <translation type="unfinished">Log</translation>
+        <translation type="obsolete">Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="211"/>
         <source>View</source>
-        <translation type="unfinished">Widok</translation>
+        <translation type="obsolete">Widok</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="226"/>
+        <location filename="../qt-ui/mainwindow.ui" line="218"/>
         <source>Filter</source>
         <translation type="unfinished">Filtr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="232"/>
         <source>Help</source>
-        <translation type="unfinished">Pomoc</translation>
+        <translation type="obsolete">Pomoc</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="177"/>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="245"/>
+        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <source>&amp;Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <source>&amp;View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <source>&amp;Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>&amp;New logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
         <translation type="unfinished">Nowy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <source>&amp;Open logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="256"/>
+        <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
+        <location filename="../qt-ui/mainwindow.ui" line="281"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation type="unfinished">Zapisz jako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
+        <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="277"/>
+        <location filename="../qt-ui/mainwindow.ui" line="292"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation type="unfinished">Zamknij</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="285"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="176"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <source>Export UDDF</source>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <source>Export &amp;UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
-        <source>Print</source>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <source>Ctrl+U</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="301"/>
-        <source>Ctrl+P</source>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <source>&amp;Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
-        <source>Preferences</source>
-        <translation type="unfinished">Ustawienia</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <source>Ctrl+,</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="311"/>
-        <source>Quit</source>
-        <translation type="unfinished">Wyjście</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
-        <source>Ctrl+Q</source>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <source>Import from &amp;dive computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <source>Download from Dive computer</source>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
-        <source>Ctrl+D</source>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <source>Ctrl+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="327"/>
-        <source>Download from Web Service</source>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <source>&amp;Edit Device Names</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="332"/>
-        <source>Edit Device Names</source>
-        <translation type="unfinished">Edycja nazw komputerów nurkowych</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <source>Ctrl++</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="337"/>
-        <source>Add Dive</source>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <source>&amp;Renumber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
-        <source>Renumber</source>
-        <translation type="unfinished">Zmień numerację</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Ctrl+R</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
-        <source>Auto Group</source>
+        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <source>Toggle &amp;Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
-        <source>Toggle Zoom</source>
-        <translation type="unfinished">Skalowanie wykresu</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <source>&amp;Yearly Statistics</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
-        <source>Yearly Statistics</source>
-        <translation type="unfinished">Statystyka roczna</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <source>Ctrl+Y</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
-        <source>View List</source>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Dive List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="365"/>
-        <source>Ctrl+2</source>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <source>Profile</source>
+        <translation type="unfinished">Profil</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <source>Info</source>
+        <translation type="unfinished">Informacje</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
-        <source>View Profile</source>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <source>User &amp;Manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="373"/>
-        <source>Ctrl+3</source>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <source>Globe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
-        <source>View Info</source>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <source>P&amp;lan Dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="381"/>
-        <source>Ctrl+4</source>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <source>Ctrl+L</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <source>Import CSV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <source>Import CS&amp;V</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <source>Import from Divelogs.de</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <source>Preferences</source>
+        <translation type="unfinished">Ustawienia</translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="obsolete">Wyjście</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <source>Ctrl+D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Device Names</source>
+        <translation type="obsolete">Edycja nazw komputerów nurkowych</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <source>Add Dive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Renumber</source>
+        <translation type="obsolete">Zmień numerację</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/mainwindow.ui" line="386"/>
-        <source>View All</source>
+        <source>Auto Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="389"/>
+        <source>Toggle Zoom</source>
+        <translation type="obsolete">Skalowanie wykresu</translation>
+    </message>
+    <message>
+        <source>Yearly Statistics</source>
+        <translation type="obsolete">Statystyka roczna</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <source>Ctrl+2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <source>Ctrl+3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <source>Ctrl+4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>Ctrl+1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Prev DC</source>
         <translation type="unfinished">Poprzedni komputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
+        <location filename="../qt-ui/mainwindow.ui" line="439"/>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="402"/>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Next DC</source>
         <translation type="unfinished">Następny komputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="405"/>
+        <location filename="../qt-ui/mainwindow.ui" line="447"/>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="410"/>
+        <location filename="../qt-ui/mainwindow.ui" line="452"/>
         <source>Select Events</source>
         <translation type="unfinished">Wybór zdarzeń</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
         <source>Input Plan</source>
         <translation type="unfinished">Wprowadź plan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
         <source>About Subsurface</source>
         <translation type="unfinished">O Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>User Manual</source>
-        <translation type="unfinished">instrukcja obsługi</translation>
+        <translation type="obsolete">instrukcja obsługi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>F1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="433"/>
-        <source>View Globe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="478"/>
         <source>Ctrl+5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="441"/>
-        <source>Dive Planner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="108"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Open File</source>
         <translation type="unfinished">Otwórz plik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="271"/>
-        <source>manually added dive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="448"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="450"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="455"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
         <translation type="unfinished">Zapisać zmiany?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="456"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="695"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="696"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="144"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="250"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="286"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="197"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3344,215 +3616,235 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="218"/>
+        <location filename="../qt-ui/preferences.ui" line="199"/>
+        <source>Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="205"/>
+        <source>Use Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="225"/>
+        <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="235"/>
+        <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="245"/>
+        <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="269"/>
+        <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
         <translation type="unfinished">Głębokość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="276"/>
+        <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
         <translation type="unfinished">Metry</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="286"/>
+        <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
         <translation type="unfinished">Stopy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
         <translation type="unfinished">Ciśnienie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="303"/>
+        <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
         <translation type="unfinished">Bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="313"/>
+        <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="330"/>
+        <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
         <translation type="unfinished">Litry</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="340"/>
+        <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
         <translation type="unfinished">cuft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="350"/>
+        <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
         <translation type="unfinished">Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="357"/>
+        <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
         <translation type="unfinished">Celsjusz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
         <translation type="unfinished">Fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="377"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
         <translation type="unfinished">Balast</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
         <translation type="unfinished">lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="464"/>
+        <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="472"/>
+        <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="495"/>
-        <location filename="../qt-ui/preferences.ui" line="536"/>
-        <location filename="../qt-ui/preferences.ui" line="577"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="513"/>
+        <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="554"/>
+        <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="595"/>
+        <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="618"/>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="634"/>
+        <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="643"/>
+        <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="666"/>
+        <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="677"/>
+        <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="700"/>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="710"/>
+        <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="721"/>
-        <source>Show time</source>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
+        <source>Calculate NDL/TTS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="733"/>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>Show SAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
+        <source>GFLow at max depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="739"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
-        <source>XML Files (*.xml)</source>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3690,51 +3982,86 @@ Please, remove them first.</source>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="257"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="259"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <source>Hide events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <source>Hide all %1 events?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <source>Remove the selected event?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <source>%1 @ %2:%3</source>
+        <translation type="unfinished"></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>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="337"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="383"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="384"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="582"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="850"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <source>Measure properties of dive segments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
+        <source>Scale your dive to screen size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
+        <source>Edit</source>
+        <translation type="unfinished">Edytuj</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
         <translation type="unfinished">powietrze</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="584"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="851"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="859"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
         <translation type="unfinished">Przejście na obieg otwarty</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="861"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished"> początek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="862"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished"> koniec</translation>
@@ -3743,62 +4070,62 @@ Please, remove them first.</source>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1497"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
         <translation type="unfinished">nieznana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1502"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1505"/>
+        <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1512"/>
+        <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1517"/>
+        <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
         <translation type="unfinished">Butla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1519"/>
+        <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
         <translation type="unfinished">Gaz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1547"/>
+        <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
         <translation type="unfinished">SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1549"/>
+        <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
         <translation type="unfinished">Max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1551"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1564"/>
+        <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1570"/>
+        <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3807,30 +4134,30 @@ Please, remove them first.</source>
     <name>QObject</name>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="44"/>
         <source>AIR</source>
         <translation type="unfinished">POWIETRZE</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="38"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="45"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="723"/>
+        <source>Remove this Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>EAN32</source>
-        <translation type="unfinished">EAN32</translation>
+        <translation type="obsolete">EAN32</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="46"/>
         <source>EAN36</source>
-        <translation type="unfinished">EAN36</translation>
+        <translation type="obsolete">EAN36</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="47"/>
-        <source>Choose Gas</source>
+        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <source>No location data - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="188"/>
-        <source>No location data - move the map and double-click to set the dive location</source>
+        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3839,17 +4166,17 @@ Please, remove them first.</source>
         <translation type="unfinished">Zamknij</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="26"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="29"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation type="unfinished">min.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation type="unfinished">max.</translation>
     </message>
@@ -3868,92 +4195,95 @@ Please, remove them first.</source>
     </message>
 </context>
 <context>
-    <name>SubsurfaceAbout</name>
+    <name>ShiftTimesDialog</name>
     <message>
-        <location filename="../qt-ui/about.ui" line="23"/>
-        <source>About Subsurface</source>
-        <translation type="unfinished">O Subsurface</translation>
+        <location filename="../qt-ui/shifttimes.ui" line="14"/>
+        <source>Shift selected times</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
+        <location filename="../qt-ui/shifttimes.ui" line="35"/>
+        <source>Shift times of selected dives by</source>
         <translation type="unfinished"></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>
+        <location filename="../qt-ui/shifttimes.ui" line="80"/>
+        <source>h:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="22"/>
-        <source>&amp;License</source>
+        <location filename="../qt-ui/shifttimes.ui" line="90"/>
+        <source>earlier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
-        <source>&amp;Website</source>
+        <location filename="../qt-ui/shifttimes.ui" line="97"/>
+        <source>later</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SubsurfaceWebServices</name>
+    <name>SubsurfaceAbout</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="14"/>
-        <source>Download Location Data</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/about.ui" line="23"/>
+        <source>About Subsurface</source>
+        <translation type="unfinished">O Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="37"/>
-        <source>Download</source>
+        <location filename="../qt-ui/about.ui" line="64"/>
+        <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="44"/>
-        <source>Enter your ID here</source>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="51"/>
-        <source>User ID</source>
+        <location filename="../qt-ui/about.cpp" line="22"/>
+        <source>&amp;License</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="58"/>
-        <source>Status:</source>
+        <location filename="../qt-ui/about.cpp" line="23"/>
+        <source>&amp;Website</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="49"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
         <translation type="unfinished">Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="90"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="106"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="130"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
         <translation type="unfinished">Błąd połączenia:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
         <translation type="unfinished">Niepoprawny identyfikator użytkownika!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
         <translation type="unfinished">Nie można przetworzyć odpowiedzi!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="133"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
         <translation type="unfinished">Pobieranie zakończone sukcesem!</translation>
     </message>
@@ -3974,17 +4304,17 @@ Please, remove them first.</source>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Bar</source>
         <translation type="unfinished">Bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3992,7 +4322,7 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1393"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4000,96 +4330,139 @@ Please, remove them first.</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>WebServices</name>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="14"/>
+        <source>Download Location Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="20"/>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="27"/>
+        <source>Enter your ID here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="34"/>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="58"/>
+        <source>User ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="72"/>
+        <source>Password</source>
+        <translation type="unfinished">Hasło</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="86"/>
+        <source>Upload</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
         <translation type="unfinished">Rodzaj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
         <translation type="unfinished">Balast</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="460"/>
+        <source>Clicking here will remove this weigthsystem.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
- &gt; Month</source>
+ &gt; Month / Trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
         <translation type="unfinished">#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1307"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1310"/>
+        <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1311"/>
+        <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1312"/>
-        <location filename="../qt-ui/models.cpp" line="1315"/>
-        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <location filename="../qt-ui/models.cpp" line="1418"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1313"/>
-        <location filename="../qt-ui/models.cpp" line="1316"/>
-        <location filename="../qt-ui/models.cpp" line="1319"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"></translation>
@@ -4098,91 +4471,74 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="44"/>
+        <location filename="../dive.c" line="57"/>
         <source>pascal</source>
         <translation type="unfinished">pascal</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="48"/>
-        <location filename="../qt-gui.cpp" line="323"/>
+        <location filename="../dive.c" line="61"/>
+        <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
         <translation type="unfinished">bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="52"/>
-        <location filename="../qt-gui.cpp" line="326"/>
+        <location filename="../dive.c" line="65"/>
+        <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
         <translation type="unfinished">psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="88"/>
-        <location filename="../qt-gui.cpp" line="304"/>
+        <location filename="../dive.c" line="101"/>
+        <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
         <translation type="unfinished">l</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="93"/>
-        <location filename="../qt-gui.cpp" line="307"/>
+        <location filename="../dive.c" line="106"/>
+        <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
         <translation type="unfinished">cuft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="121"/>
-        <location filename="../qt-gui.cpp" line="207"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
         <translation type="unfinished">m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="126"/>
-        <location filename="../qt-gui.cpp" line="210"/>
+        <location filename="../dive.c" line="139"/>
+        <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
         <translation type="unfinished">ft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="170"/>
-        <location filename="../qt-gui.cpp" line="233"/>
+        <location filename="../dive.c" line="183"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
         <translation type="unfinished">lbs</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
-        <location filename="../qt-gui.cpp" line="231"/>
+        <location filename="../dive.c" line="187"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="966"/>
+        <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
         <translation type="unfinished">(%s) lub (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="473"/>
         <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <translation type="unfinished">%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="490"/>
-        <source>%1$s %2$d, %3$d
-%4$02d:%5$02d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="512"/>
-        <source>%1$s %2$d (%3$d dives)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="519"/>
-        <source>%1$s %2$d (1 dive)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="550"/>
-        <location filename="../planner.c" line="94"/>
-        <location filename="../planner.c" line="748"/>
-        <location filename="../planner.c" line="749"/>
-        <location filename="../statistics.c" line="360"/>
-        <location filename="../statistics.c" line="371"/>
+        <location filename="../divelist.c" line="488"/>
+        <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"/>
         <source>air</source>
         <translation type="unfinished">powietrze</translation>
     </message>
@@ -4212,312 +4568,324 @@ Maximum</source>
         <translation type="unfinished">doczepiany</translation>
     </message>
     <message>
-        <location filename="../file.c" line="106"/>
-        <location filename="../file.c" line="108"/>
-        <location filename="../file.c" line="303"/>
-        <location filename="../file.c" line="305"/>
+        <location filename="../file.c" line="107"/>
+        <location filename="../file.c" line="109"/>
+        <location filename="../file.c" line="308"/>
+        <location filename="../file.c" line="310"/>
+        <location filename="../file.c" line="390"/>
+        <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation type="unfinished">Błąd odczytu &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <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>
+    </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>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
         <translation type="unfinished">brak</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
         <translation type="unfinished">przystanek deco</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
         <translation type="unfinished">pozostały czas na dnie</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
         <translation type="unfinished">wynurzanie</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
         <translation type="unfinished">sufit</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
         <translation type="unfinished">wysiłek</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
         <translation type="unfinished">nadajnik</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
         <translation type="unfinished">naruszenie</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
         <translation type="unfinished">zakładka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
         <translation type="unfinished">powierzchnia</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
         <translation type="unfinished">przystanek bezpieczeństwa</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
         <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
         <translation type="unfinished">zmiana gazu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
         <translation type="unfinished">przystanek bezpieczeństwa (opcjonalny)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
         <translation type="unfinished">przystanek bezpieczeństwa (obowiązkowy)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
         <translation type="unfinished">deepstop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
         <translation type="unfinished">sufit (przystanek bezpieczeństwa)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
         <translation type="unfinished">czas nurkowania</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
         <translation type="unfinished">Max głębokość</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
         <translation type="unfinished">Ekspozycja tlenowa</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
         <translation type="unfinished">PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
         <translation type="unfinished">Pozostały czas oddychania</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
         <translation type="unfinished">rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
         <translation type="unfinished">kierunek</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
         <translation type="unfinished">Ostrzeżenie: poziom nasycenia tkanek</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
         <translation type="unfinished">czas bezdekompresyjny</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="157"/>
+        <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
         <translation type="unfinished">niepoprawny znacznik</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="390"/>
+        <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
         <translation type="unfinished">Nie udało się utworzyć parsera dla %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="396"/>
+        <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
         <translation type="unfinished">Błąd podczas przetwarzania danych</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="405"/>
+        <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
         <translation type="unfinished">Błąd podczas przetwarzania daty i czasu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
         <translation type="unfinished">Nurkowanie %d: %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="427"/>
+        <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
         <translation type="unfinished">Błąd podczas przetwarzania czasu nurkowania</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="437"/>
+        <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
         <translation type="unfinished">Błąd podczas przetwarzania głębokości</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="447"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
         <translation type="unfinished">Błąd podczas przetwarzania danych o ilości użytych rodzajów gazu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
         <translation type="unfinished">Błąd podczas przetwarzania danych o zasoleniu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="469"/>
+        <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
         <translation type="unfinished">Błąd podczas przetwarzania danych o użytym rodzaju gazu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
         <translation type="unfinished">Błąd podczas przetwarzania próbek</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="613"/>
+        <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
         <translation type="unfinished">Oczekiwanie na działanie użytkownika</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="621"/>
+        <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation type="unfinished">model=%u (0x%08x), firmware=%u (0x%08x), numer seryjny=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="663"/>
+        <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
         <translation type="unfinished">Błąd rejestracji uchwytu (event handler)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="668"/>
+        <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished">Błąd rejestracji uchwytu (cancellation handler)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="672"/>
+        <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
         <translation type="unfinished">Błąd podczas importowania danych</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="690"/>
+        <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished">Nie można utworzyć kontekstu libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished">Nie udało się otworzyć %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="549"/>
+        <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
         <translation type="unfinished">Podejrzany skład procentowy %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1695"/>
+        <location filename="../parse-xml.c" line="1717"/>
         <source>Failed to parse &apos;%s&apos;.
 </source>
         <translation type="unfinished">Nie udało się przetworzyć &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1696"/>
+        <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation type="unfinished">Nie udało się przetworzyć &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1894"/>
+        <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
         <translation type="unfinished">Zapytanie bazy danych  get_events nie powiodło się.⏎
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1929"/>
+        <location filename="../parse-xml.c" line="1951"/>
         <source>Database connection failed &apos;%s&apos;.
 </source>
         <translation type="unfinished">Błąd połączenia z bazą danych &apos;%s&apos;.⏎
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1936"/>
+        <location filename="../parse-xml.c" line="1958"/>
         <source>Database query failed &apos;%s&apos;.
 </source>
         <translation type="unfinished">Błąd komunikacji z bazą danych &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2048"/>
+        <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
         <translation type="unfinished">Nie można otworzyć arkusza stylów (%s)/%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="96"/>
-        <location filename="../statistics.c" line="363"/>
+        <location filename="../planner.c" line="98"/>
+        <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
         <translation type="unfinished">EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="131"/>
+        <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation type="unfinished">Nie znaleziono gazu %d/%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="192"/>
         <source>Cylinder for planning</source>
-        <translation type="unfinished">butle do zaplanowania</translation>
+        <translation type="obsolete">butle do zaplanowania</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="217"/>
         <source>Simulated Dive</source>
-        <translation type="unfinished">Symulowane nurkowanie</translation>
+        <translation type="obsolete">Symulowane nurkowanie</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="294"/>
+        <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
         <translation type="unfinished">Zbyt wiele rodzajów gazu</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="472"/>
+        <location filename="../planner.c" line="493"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -4530,180 +4898,173 @@ w oparciu o GFlow = %.0f oraz GFhigh = %.0f
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="513"/>
+        <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished">Przejście do  %.*f %s w %d:%02d min - runtime %d:%02u z %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="522"/>
+        <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished">Pozostań na %.*f %s przez %d:%02d min - runtime %d:%02u z %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
         <translation type="unfinished">Zmiana gazu na %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
         <translation type="unfinished">Zużycie gazu:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="552"/>
+        <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
         <translation type="unfinished">%.0f%s z %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="776"/>
         <source>ean</source>
         <translation type="unfinished">ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1154"/>
         <source>D:%.1f %s</source>
-        <translation type="unfinished">Gł:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1158"/>
-        <source>%s
-T:%d:%02d</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Gł:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
         <translation type="unfinished">%s
 P:%d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
         <translation type="unfinished">%s
 T:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1177"/>
+        <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation type="unfinished">%s
 Obliczony sufit %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1189"/>
+        <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation type="unfinished">%s
 Przyst. bezp.:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1199"/>
+        <source>@:%d:%02d
+D:%.1f %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1219"/>
+        <source>%s
+SAC:%2.1fl/min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation type="unfinished">%s
 Przyst. bezp.:nieznany czas @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation type="unfinished">%s
 Deco:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1211"/>
+        <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation type="unfinished">%s
 Deco:nieznany czas @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1217"/>
+        <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
         <translation type="unfinished">%s
 dekompresja</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
-        <source>%s
-NDL:-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1275"/>
         <source>%s
 NDL:%umin</source>
         <translation type="unfinished">%s
 NDL:%umin</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
-        <source>%s
-TTS:%umin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1223"/>
         <source>%s
 CNS:%u%%</source>
         <translation type="unfinished">%s
 CNS:%u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1227"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation type="unfinished">%s
 pO%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1231"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation type="unfinished">%s
 pN%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1243"/>
+        <location filename="../profile.c" line="1235"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation type="unfinished">%s
 pHe:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1240"/>
         <source>%s
 MOD:%d%s</source>
         <translation type="unfinished">%s
 MOD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1247"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -4714,295 +5075,346 @@ END:%d%s
 EADD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1349"/>
+        <location filename="../profile.c" line="1280"/>
+        <source>%s
+Deco:%umin @ %.0f %s (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1289"/>
+        <source>%s
+In deco (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>%s
+NDL:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1296"/>
+        <source>%s
+TTS:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
-        <location filename="../profile.c" line="1357"/>
+        <location filename="../profile.c" line="1409"/>
+        <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1361"/>
+        <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1365"/>
+        <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1369"/>
-        <source>%s%sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1425"/>
+        <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1373"/>
-        <location filename="../profile.c" line="1377"/>
-        <source>%s %sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1429"/>
+        <location filename="../profile.c" line="1433"/>
+        <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1384"/>
+        <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="284"/>
+        <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="288"/>
+        <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../qt-gui.cpp" line="460"/>
+        <source>%1, %2 %3, %4 %5:%6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="473"/>
+        <source>%1 %2, %3
+%4:%5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="486"/>
+        <source>%1 %2 (%3 dives)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="491"/>
+        <source>%1 %2 (1 dive)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>invalid</source>
-        <translation type="unfinished">niepoprawne</translation>
+        <translation type="obsolete">niepoprawne</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>boat</source>
         <translation type="unfinished">z łodzi</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>shore</source>
         <translation type="unfinished">z brzegu</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>drift</source>
         <translation type="unfinished">w dryfie</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>deep</source>
         <translation type="unfinished">głębokie</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>cavern</source>
         <translation type="unfinished">kawerna</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="14"/>
         <source>ice</source>
         <translation type="unfinished">podlodowe</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>wreck</source>
         <translation type="unfinished">wrakowe</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>cave</source>
         <translation type="unfinished">jaskiniowe</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>altitude</source>
         <translation type="unfinished">wysokość</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>pool</source>
         <translation type="unfinished">basen</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>lake</source>
         <translation type="unfinished">jezioro</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="16"/>
         <source>river</source>
         <translation type="unfinished">rzeka</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="17"/>
         <source>night</source>
         <translation type="unfinished">nocne</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="17"/>
+        <source>fresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="17"/>
+        <source>student</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>freshwater</source>
-        <translation type="unfinished">słodkowodne</translation>
+        <translation type="obsolete">słodkowodne</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
         <source>training</source>
-        <translation type="unfinished">szkolenie</translation>
+        <translation type="obsolete">szkolenie</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
         <source>teaching</source>
-        <translation type="unfinished">nauczanie</translation>
+        <translation type="obsolete">nauczanie</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
         <source>photo</source>
         <translation type="unfinished">fotografia</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
         <source>video</source>
         <translation type="unfinished">video</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
+        <source>instructor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="19"/>
         <source>deco</source>
         <translation type="unfinished">deco</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="199"/>
+        <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
         <translation type="unfinished">więcej niż %d dni</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="205"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation type="unfinished">%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="207"/>
+        <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
         <translation type="unfinished">%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="218"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation type="unfinished">dla nurkowania nr</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="225"/>
+        <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
         <translation type="unfinished">dla wybranych nurkowań</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="260"/>
+        <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
         <translation type="unfinished">dla nurkowania #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="262"/>
+        <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
         <translation type="unfinished">dla wybranego nurkowania</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="264"/>
+        <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
         <translation type="unfinished">dla wszystkich nurkowań</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="266"/>
+        <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
         <translation type="unfinished">(brak nurkowań)</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="363"/>
-        <source>, EAN%d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
         <translation type="unfinished">Nie</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
         <translation type="unfinished">Pon</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
         <translation type="unfinished">Wto</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
         <translation type="unfinished">Śro</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
         <translation type="unfinished">Czw</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
         <translation type="unfinished">Pią</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
         <translation type="unfinished">Sob</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
         <translation type="unfinished">Sty</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
         <translation type="unfinished">Lut</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
         <translation type="unfinished">Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
         <translation type="unfinished">Kwi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
         <translation type="unfinished">Maj</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
         <translation type="unfinished">Cze</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
         <translation type="unfinished">Lip</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
         <translation type="unfinished">Sie</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
         <translation type="unfinished">Wrz</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
         <translation type="unfinished">Paź</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
         <translation type="unfinished">Lis</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
         <translation type="unfinished">Gru</translation>
     </message>
diff --git a/translations/subsurface_pt_BR.ts b/translations/subsurface_pt_BR.ts
index 4af496f0a..a86ec9007 100644
--- a/translations/subsurface_pt_BR.ts
+++ b/translations/subsurface_pt_BR.ts
@@ -560,42 +560,135 @@ tranlators here
     </message>
 </context>
 <context>
+    <name>CSVImportDialog</name>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <source>Import File (CSV)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <source>Field Separator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <source>Field Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <source>Depth</source>
+        <translation type="unfinished">Profundidade</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <source>Temp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
+        <source>Po2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <source>Cns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <source>Stopdepth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <source>Pre-configured imports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>Open CSV Log File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>CSV Files (*.csv)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="65"/>
+        <source>Switch at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="163"/>
+        <source>Clicking here will remove this cylinder.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="385"/>
+        <source>Cylinder cannot be removed</source>
+        <translation type="unfinished"></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>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
@@ -619,30 +712,35 @@ tranlators here
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Device ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Model</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
         <translation type="unfinished">Apelido</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <source>Clicking here will remove this divecomputer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1009"/>
+        <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1011"/>
+        <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
         <translation type="unfinished"></translation>
     </message>
@@ -650,186 +748,198 @@ tranlators here
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="39"/>
+        <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="398"/>
+        <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="399"/>
+        <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="400"/>
-        <source>collapse</source>
+        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <source>collapse others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="402"/>
-        <source>remove dive from trip</source>
+        <location filename="../qt-ui/divelistview.cpp" line="638"/>
+        <source>remove dive(s) from trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="405"/>
-        <source>Merge trip with trip above</source>
+        <location filename="../qt-ui/divelistview.cpp" line="639"/>
+        <source>create new trip above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="406"/>
-        <source>Merge trip with trip below</source>
+        <location filename="../qt-ui/divelistview.cpp" line="640"/>
+        <source>add dive(s) to trip immideately above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="410"/>
-        <source>delete dive</source>
+        <location filename="../qt-ui/divelistview.cpp" line="643"/>
+        <source>merge trip with trip above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="412"/>
-        <source>merge selected dives</source>
+        <location filename="../qt-ui/divelistview.cpp" line="644"/>
+        <source>merge trip with trip below</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../qt-ui/divelistview.cpp" line="648"/>
+        <source>delete dive(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
-        <source>Bottom SAC</source>
+        <location filename="../qt-ui/divelistview.cpp" line="652"/>
+        <source>save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
-        <source>High GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="653"/>
+        <source>export As UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
-        <source>SAC on DECO Stop</source>
+        <location filename="../qt-ui/divelistview.cpp" line="654"/>
+        <source>shift times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
-        <source>Low GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
+        <source>Save Dives As...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="114"/>
-        <source>Last Stop at 6m</source>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
+        <source>Save File as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="141"/>
-        <source>Start Time</source>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="148"/>
-        <source>ATM Pressure</source>
+        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <source>merge selected dives</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DivePlannerGraphics</name>
+    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="143"/>
-        <source>10m</source>
+        <location filename="../qt-ui/diveplanner.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="145"/>
-        <source>30ft</source>
+        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <source>Bottom SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="146"/>
-        <source>Increase maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <source>SAC on DECO Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="147"/>
-        <source>Decreases maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <source>Increase minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>10min</source>
+        <location filename="../qt-ui/diveplanner.ui" line="108"/>
+        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>Decreases minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <source>Last Stop at 6m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
-        <source>Handler Position Error</source>
+        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="386"/>
-        <source>One or more of your stops will be lost with this operations, 
-Please, remove them first.</source>
+        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <source>ATM Pressure</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DivePlannerGraphics</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="415"/>
-        <source>Air</source>
+        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <source>10m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="136"/>
+        <source>30ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <source>Handler Position Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="420"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="421"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="424"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="425"/>
-        <source>Air</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <source>AIR</source>
+        <translation type="unfinished">AR</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="986"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="987"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="988"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="989"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1141"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1142"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -837,75 +947,85 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="851"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="937"/>
+        <source>Available Gases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <source>add dive data point</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1051"/>
+        <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
         <translation type="unfinished">#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1052"/>
+        <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
         <translation type="unfinished">Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1055"/>
+        <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
         <translation type="unfinished">min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
         <translation type="unfinished">lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1058"/>
+        <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1059"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1061"/>
+        <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1062"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1063"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1064"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
         <translation type="unfinished">Local</translation>
     </message>
@@ -913,13 +1033,19 @@ Please, remove them first.</source>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="138"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
         <translation type="unfinished">Erro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="142"/>
-        <source>retry</source>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
+        <source>Retry</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -980,6 +1106,7 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
         <translation type="unfinished">Notas do mergulho</translation>
     </message>
@@ -994,225 +1121,238 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <source>M/d/yy h:mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="108"/>
-        <location filename="../qt-ui/maintab.cpp" line="307"/>
+        <location filename="../qt-ui/maintab.ui" line="112"/>
+        <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
         <translation type="unfinished">Local</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="122"/>
+        <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="136"/>
+        <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
         <translation type="unfinished">Instrutor de Mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="143"/>
+        <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
         <translation type="unfinished">Parceiro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="166"/>
+        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="173"/>
+        <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
         <translation type="unfinished">Visibilidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="182"/>
+        <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="206"/>
-        <location filename="../qt-ui/maintab.cpp" line="308"/>
+        <location filename="../qt-ui/maintab.ui" line="217"/>
+        <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="232"/>
+        <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="319"/>
+        <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
         <translation type="unfinished">Info do mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="361"/>
+        <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
         <translation type="unfinished">Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="380"/>
+        <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="399"/>
+        <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="418"/>
+        <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="437"/>
-        <location filename="../qt-ui/maintab.ui" line="692"/>
+        <location filename="../qt-ui/maintab.ui" line="466"/>
+        <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="456"/>
+        <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="475"/>
+        <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="494"/>
+        <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="513"/>
+        <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="532"/>
+        <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="551"/>
+        <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="570"/>
+        <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
         <translation type="unfinished">Tempo de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="589"/>
+        <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="668"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation type="unfinished">Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="680"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="704"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="716"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="735"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="68"/>
+        <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
         <translation type="unfinished">Cilindros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="129"/>
-        <location filename="../qt-ui/maintab.cpp" line="131"/>
-        <source>This trip is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <source>Trip Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="137"/>
-        <location filename="../qt-ui/maintab.cpp" line="139"/>
-        <source>This dive is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="296"/>
+        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <source>Trip Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="286"/>
-        <source>Trip Location</source>
+        <location filename="../qt-ui/maintab.cpp" line="134"/>
+        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="288"/>
-        <source>Trip Notes</source>
+        <location filename="../qt-ui/maintab.cpp" line="143"/>
+        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
-        <location filename="../qt-ui/maintab.cpp" line="337"/>
-        <location filename="../qt-ui/maintab.cpp" line="338"/>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="146"/>
+        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <source>This dive is being edited. Select Save or Cancel when done.</source>
+        <translation type="unfinished"></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"/>
         <source>/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <source>unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1225,308 +1365,404 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="177"/>
         <source>File</source>
-        <translation type="unfinished">Arquivo</translation>
+        <translation type="obsolete">Arquivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="196"/>
         <source>Log</source>
-        <translation type="unfinished">Log</translation>
+        <translation type="obsolete">Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="211"/>
         <source>View</source>
-        <translation type="unfinished">Visualizar</translation>
+        <translation type="obsolete">Visualizar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="226"/>
+        <location filename="../qt-ui/mainwindow.ui" line="218"/>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="232"/>
-        <source>Help</source>
+        <location filename="../qt-ui/mainwindow.ui" line="177"/>
+        <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="245"/>
-        <source>New</source>
+        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <source>&amp;Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <source>&amp;View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <source>&amp;Import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>&amp;New logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <source>&amp;Open logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="256"/>
+        <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
+        <location filename="../qt-ui/mainwindow.ui" line="281"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
+        <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="277"/>
+        <location filename="../qt-ui/mainwindow.ui" line="292"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation type="unfinished">Fechar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="285"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="176"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <source>Export UDDF</source>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <source>Export &amp;UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
-        <source>Print</source>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <source>Ctrl+U</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="301"/>
-        <source>Ctrl+P</source>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <source>&amp;Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
-        <source>Preferences</source>
+        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <source>Ctrl+,</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="311"/>
-        <source>Quit</source>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
-        <source>Ctrl+Q</source>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <source>Import from &amp;dive computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <source>Download from Dive computer</source>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
-        <source>Ctrl+D</source>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <source>Ctrl+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="327"/>
-        <source>Download from Web Service</source>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <source>&amp;Edit Device Names</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="332"/>
-        <source>Edit Device Names</source>
+        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <source>Ctrl++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="337"/>
-        <source>Add Dive</source>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <source>&amp;Renumber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
-        <source>Renumber</source>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Ctrl+R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
-        <source>Auto Group</source>
+        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <source>Toggle &amp;Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
-        <source>Toggle Zoom</source>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <source>&amp;Yearly Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
-        <source>Yearly Statistics</source>
+        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <source>Ctrl+Y</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
-        <source>View List</source>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Dive List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="365"/>
-        <source>Ctrl+2</source>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <source>Profile</source>
+        <translation type="unfinished">Perfil</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
-        <source>View Profile</source>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="373"/>
-        <source>Ctrl+3</source>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <source>User &amp;Manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
-        <source>View Info</source>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <source>Globe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="381"/>
-        <source>Ctrl+4</source>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <source>P&amp;lan Dive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <source>Ctrl+L</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <source>Import CSV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <source>Import CS&amp;V</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <source>Import from Divelogs.de</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <source>Preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <source>Ctrl+D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <source>Add Dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="386"/>
-        <source>View All</source>
+        <source>Auto Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="389"/>
+        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <source>Ctrl+2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <source>Ctrl+3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <source>Ctrl+4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>Ctrl+1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Prev DC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
+        <location filename="../qt-ui/mainwindow.ui" line="439"/>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="402"/>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Next DC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="405"/>
+        <location filename="../qt-ui/mainwindow.ui" line="447"/>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="410"/>
+        <location filename="../qt-ui/mainwindow.ui" line="452"/>
         <source>Select Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
         <source>Input Plan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
         <source>About Subsurface</source>
         <translation type="unfinished">Sobre o Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="425"/>
-        <source>User Manual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>F1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="433"/>
-        <source>View Globe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="478"/>
         <source>Ctrl+5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="441"/>
-        <source>Dive Planner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="108"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Open File</source>
         <translation type="unfinished">Abrir arquivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="271"/>
-        <source>manually added dive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="448"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="450"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="455"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="456"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="695"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="696"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="144"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="250"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="286"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="197"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1589,215 +1825,235 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="218"/>
+        <location filename="../qt-ui/preferences.ui" line="199"/>
+        <source>Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="205"/>
+        <source>Use Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="225"/>
+        <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="235"/>
+        <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="245"/>
+        <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="269"/>
+        <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
         <translation type="unfinished">Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="276"/>
+        <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
         <translation type="unfinished">Metro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="286"/>
+        <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="303"/>
+        <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="313"/>
+        <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="330"/>
+        <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="340"/>
+        <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="350"/>
+        <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="357"/>
+        <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
         <translation type="unfinished">Celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="377"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
         <translation type="unfinished">lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="464"/>
+        <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="472"/>
+        <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="495"/>
-        <location filename="../qt-ui/preferences.ui" line="536"/>
-        <location filename="../qt-ui/preferences.ui" line="577"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="513"/>
+        <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="554"/>
+        <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="595"/>
+        <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="618"/>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="634"/>
+        <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="643"/>
+        <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="666"/>
+        <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="677"/>
+        <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="700"/>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="710"/>
+        <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="721"/>
-        <source>Show time</source>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
+        <source>Calculate NDL/TTS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="733"/>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>Show SAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
+        <source>GFLow at max depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="739"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
-        <source>XML Files (*.xml)</source>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1935,51 +2191,86 @@ Please, remove them first.</source>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="257"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="259"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <source>Hide events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <source>Hide all %1 events?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <source>Remove the selected event?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <source>%1 @ %2:%3</source>
+        <translation type="unfinished"></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>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="337"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="383"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="384"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="582"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="850"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <source>Measure properties of dive segments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
+        <source>Scale your dive to screen size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
         <translation type="unfinished">ar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="584"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="851"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="859"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="861"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished">início</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="862"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished">fim</translation>
@@ -1988,62 +2279,62 @@ Please, remove them first.</source>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1497"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1502"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1505"/>
+        <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1512"/>
+        <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1517"/>
+        <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
         <translation type="unfinished">Cilindro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1519"/>
+        <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1547"/>
+        <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1549"/>
+        <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1551"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1564"/>
+        <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1570"/>
+        <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2052,30 +2343,22 @@ Please, remove them first.</source>
     <name>QObject</name>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="44"/>
         <source>AIR</source>
         <translation type="unfinished">AR</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="38"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="45"/>
-        <source>EAN32</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="46"/>
-        <source>EAN36</source>
+        <location filename="../qt-ui/diveplanner.cpp" line="723"/>
+        <source>Remove this Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="47"/>
-        <source>Choose Gas</source>
+        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <source>No location data - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="188"/>
-        <source>No location data - move the map and double-click to set the dive location</source>
+        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2084,17 +2367,17 @@ Please, remove them first.</source>
         <translation type="unfinished">Fechar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="26"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation type="unfinished">Média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="29"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation type="unfinished">Máximo</translation>
     </message>
@@ -2113,92 +2396,95 @@ Please, remove them first.</source>
     </message>
 </context>
 <context>
-    <name>SubsurfaceAbout</name>
+    <name>ShiftTimesDialog</name>
     <message>
-        <location filename="../qt-ui/about.ui" line="23"/>
-        <source>About Subsurface</source>
-        <translation type="unfinished">Sobre o Subsurface</translation>
+        <location filename="../qt-ui/shifttimes.ui" line="14"/>
+        <source>Shift selected times</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
+        <location filename="../qt-ui/shifttimes.ui" line="35"/>
+        <source>Shift times of selected dives by</source>
         <translation type="unfinished"></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>
+        <location filename="../qt-ui/shifttimes.ui" line="80"/>
+        <source>h:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="22"/>
-        <source>&amp;License</source>
+        <location filename="../qt-ui/shifttimes.ui" line="90"/>
+        <source>earlier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
-        <source>&amp;Website</source>
+        <location filename="../qt-ui/shifttimes.ui" line="97"/>
+        <source>later</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SubsurfaceWebServices</name>
+    <name>SubsurfaceAbout</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="14"/>
-        <source>Download Location Data</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/about.ui" line="23"/>
+        <source>About Subsurface</source>
+        <translation type="unfinished">Sobre o Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="37"/>
-        <source>Download</source>
+        <location filename="../qt-ui/about.ui" line="64"/>
+        <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="44"/>
-        <source>Enter your ID here</source>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="51"/>
-        <source>User ID</source>
+        <location filename="../qt-ui/about.cpp" line="22"/>
+        <source>&amp;License</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="58"/>
-        <source>Status:</source>
+        <location filename="../qt-ui/about.cpp" line="23"/>
+        <source>&amp;Website</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="49"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="90"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="106"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="130"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
         <translation type="unfinished">Erro de conexão:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="133"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2219,17 +2505,17 @@ Please, remove them first.</source>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2237,7 +2523,7 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1393"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2245,96 +2531,139 @@ Please, remove them first.</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>WebServices</name>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="14"/>
+        <source>Download Location Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="20"/>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="27"/>
+        <source>Enter your ID here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="34"/>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="58"/>
+        <source>User ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="72"/>
+        <source>Password</source>
+        <translation type="unfinished">Senha</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="86"/>
+        <source>Upload</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="460"/>
+        <source>Clicking here will remove this weigthsystem.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
- &gt; Month</source>
+ &gt; Month / Trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
         <translation type="unfinished">#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1307"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1310"/>
+        <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1311"/>
+        <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1312"/>
-        <location filename="../qt-ui/models.cpp" line="1315"/>
-        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <location filename="../qt-ui/models.cpp" line="1418"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1313"/>
-        <location filename="../qt-ui/models.cpp" line="1316"/>
-        <location filename="../qt-ui/models.cpp" line="1319"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"></translation>
@@ -2343,91 +2672,70 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="44"/>
+        <location filename="../dive.c" line="57"/>
         <source>pascal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="48"/>
-        <location filename="../qt-gui.cpp" line="323"/>
+        <location filename="../dive.c" line="61"/>
+        <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="52"/>
-        <location filename="../qt-gui.cpp" line="326"/>
+        <location filename="../dive.c" line="65"/>
+        <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="88"/>
-        <location filename="../qt-gui.cpp" line="304"/>
+        <location filename="../dive.c" line="101"/>
+        <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
         <translation type="unfinished">l</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="93"/>
-        <location filename="../qt-gui.cpp" line="307"/>
+        <location filename="../dive.c" line="106"/>
+        <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="121"/>
-        <location filename="../qt-gui.cpp" line="207"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="126"/>
-        <location filename="../qt-gui.cpp" line="210"/>
+        <location filename="../dive.c" line="139"/>
+        <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="170"/>
-        <location filename="../qt-gui.cpp" line="233"/>
+        <location filename="../dive.c" line="183"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
         <translation type="unfinished">lbs</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
-        <location filename="../qt-gui.cpp" line="231"/>
+        <location filename="../dive.c" line="187"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="966"/>
+        <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="473"/>
-        <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="490"/>
-        <source>%1$s %2$d, %3$d
-%4$02d:%5$02d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="512"/>
-        <source>%1$s %2$d (%3$d dives)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="519"/>
-        <source>%1$s %2$d (1 dive)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="550"/>
-        <location filename="../planner.c" line="94"/>
-        <location filename="../planner.c" line="748"/>
-        <location filename="../planner.c" line="749"/>
-        <location filename="../statistics.c" line="360"/>
-        <location filename="../statistics.c" line="371"/>
+        <location filename="../divelist.c" line="488"/>
+        <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"/>
         <source>air</source>
         <translation type="unfinished">ar</translation>
     </message>
@@ -2457,307 +2765,315 @@ Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../file.c" line="106"/>
-        <location filename="../file.c" line="108"/>
-        <location filename="../file.c" line="303"/>
-        <location filename="../file.c" line="305"/>
+        <location filename="../file.c" line="107"/>
+        <location filename="../file.c" line="109"/>
+        <location filename="../file.c" line="308"/>
+        <location filename="../file.c" line="310"/>
+        <location filename="../file.c" line="390"/>
+        <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <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>
+    </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>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
         <translation type="unfinished">favorito</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
         <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
         <translation type="unfinished">maxdepth</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="157"/>
+        <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
         <translation type="unfinished">numero de evento inválido</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="390"/>
+        <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="396"/>
+        <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="405"/>
+        <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="427"/>
+        <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="437"/>
+        <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="447"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="469"/>
+        <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="613"/>
+        <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="621"/>
+        <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="663"/>
+        <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="668"/>
+        <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="672"/>
+        <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="690"/>
+        <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="549"/>
+        <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1695"/>
+        <location filename="../parse-xml.c" line="1717"/>
         <source>Failed to parse &apos;%s&apos;.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1696"/>
+        <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1894"/>
+        <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1929"/>
+        <location filename="../parse-xml.c" line="1951"/>
         <source>Database connection failed &apos;%s&apos;.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1936"/>
+        <location filename="../parse-xml.c" line="1958"/>
         <source>Database query failed &apos;%s&apos;.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2048"/>
+        <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="96"/>
-        <location filename="../statistics.c" line="363"/>
+        <location filename="../planner.c" line="98"/>
+        <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="131"/>
+        <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="192"/>
         <source>Cylinder for planning</source>
-        <translation type="unfinished">Cilindro para planejamento</translation>
-    </message>
-    <message>
-        <location filename="../planner.c" line="217"/>
-        <source>Simulated Dive</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Cilindro para planejamento</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="294"/>
+        <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="472"/>
+        <location filename="../planner.c" line="493"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -2770,459 +3086,499 @@ baseado em GFlow = %.0f e GFhigh = %.0f
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="513"/>
+        <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="522"/>
+        <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="552"/>
+        <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
         <translation type="unfinished">%.0f%s de %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="776"/>
         <source>ean</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1154"/>
-        <source>D:%.1f %s</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1158"/>
-        <source>%s
-T:%d:%02d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1177"/>
+        <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1189"/>
+        <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1199"/>
+        <source>@:%d:%02d
+D:%.1f %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1219"/>
+        <source>%s
+SAC:%2.1fl/min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1211"/>
+        <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation type="unfinished">%s
 Deco:tempo desconhecido @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1217"/>
+        <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
+        <location filename="../profile.c" line="1275"/>
         <source>%s
-NDL:-</source>
+NDL:%umin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../profile.c" line="1223"/>
         <source>%s
-NDL:%umin</source>
+CNS:%u%%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../profile.c" line="1227"/>
         <source>%s
-TTS:%umin</source>
+pO%s:%.2fbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../profile.c" line="1231"/>
         <source>%s
-CNS:%u%%</source>
+pN%s:%.2fbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../profile.c" line="1235"/>
         <source>%s
-pO%s:%.2fbar</source>
+pHe:%.2fbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1240"/>
         <source>%s
-pN%s:%.2fbar</source>
+MOD:%d%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1243"/>
+        <location filename="../profile.c" line="1247"/>
         <source>%s
-pHe:%.2fbar</source>
+EAD:%d%s
+END:%d%s
+EADD:%d%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1280"/>
         <source>%s
-MOD:%d%s</source>
+Deco:%umin @ %.0f %s (calc)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1289"/>
         <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
+In deco (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>%s
+NDL:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1296"/>
+        <source>%s
+TTS:%umin (calc)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1349"/>
+        <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
-        <location filename="../profile.c" line="1357"/>
+        <location filename="../profile.c" line="1409"/>
+        <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1361"/>
+        <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1365"/>
+        <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1369"/>
-        <source>%s%sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1425"/>
+        <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1373"/>
-        <location filename="../profile.c" line="1377"/>
-        <source>%s %sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1429"/>
+        <location filename="../profile.c" line="1433"/>
+        <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1384"/>
+        <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="284"/>
+        <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="288"/>
+        <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../qt-gui.cpp" line="460"/>
+        <source>%1, %2 %3, %4 %5:%6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="473"/>
+        <source>%1 %2, %3
+%4:%5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="486"/>
+        <source>%1 %2 (%3 dives)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="491"/>
+        <source>%1 %2 (1 dive)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>invalid</source>
-        <translation type="unfinished">inválido</translation>
+        <translation type="obsolete">inválido</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>boat</source>
         <translation type="unfinished">barco</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>shore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>drift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>deep</source>
         <translation type="unfinished">profundo</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>cavern</source>
         <translation type="unfinished">caverna</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="14"/>
         <source>ice</source>
         <translation type="unfinished">gelo</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>wreck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>cave</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>altitude</source>
         <translation type="unfinished">altitude</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>pool</source>
         <translation type="unfinished">piscina</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>lake</source>
         <translation type="unfinished">lago</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="16"/>
         <source>river</source>
         <translation type="unfinished">rio</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="17"/>
         <source>night</source>
         <translation type="unfinished">noite</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="17"/>
+        <source>fresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="17"/>
+        <source>student</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>freshwater</source>
-        <translation type="unfinished">águar gelada</translation>
+        <translation type="obsolete">águar gelada</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
         <source>training</source>
-        <translation type="unfinished">treinando</translation>
+        <translation type="obsolete">treinando</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
         <source>teaching</source>
-        <translation type="unfinished">ensinando</translation>
+        <translation type="obsolete">ensinando</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
         <source>photo</source>
         <translation type="unfinished">foto</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
         <source>video</source>
         <translation type="unfinished">vídeo</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
+        <source>instructor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="19"/>
         <source>deco</source>
         <translation type="unfinished">deco</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="199"/>
+        <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="205"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation type="unfinished">%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="207"/>
+        <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
         <translation type="unfinished">%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="218"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="225"/>
+        <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="260"/>
+        <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="262"/>
+        <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="264"/>
+        <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
         <translation type="unfinished">para todos os mergulhos</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="266"/>
+        <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="363"/>
-        <source>, EAN%d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
         <translation type="unfinished">Abr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
         <translation type="unfinished">Mai</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
         <translation type="unfinished">Ago</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/translations/subsurface_pt_PT.ts b/translations/subsurface_pt_PT.ts
index e961c80c0..4ebdb18d7 100644
--- a/translations/subsurface_pt_PT.ts
+++ b/translations/subsurface_pt_PT.ts
@@ -1986,42 +1986,135 @@ and Salvador Cuñat</translation>
     </message>
 </context>
 <context>
+    <name>CSVImportDialog</name>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <source>Import File (CSV)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <source>Field Separator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <source>Field Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <source>Time</source>
+        <translation type="unfinished">Tempo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <source>Depth</source>
+        <translation type="unfinished">Profundidade</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <source>Temp</source>
+        <translation type="unfinished">Temp</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
+        <source>Po2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <source>Cns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <source>Stopdepth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <source>Pre-configured imports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>Open CSV Log File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>CSV Files (*.csv)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
         <translation type="unfinished">Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
         <translation type="unfinished">Tamanho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="65"/>
+        <source>Switch at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="163"/>
+        <source>Clicking here will remove this cylinder.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="385"/>
+        <source>Cylinder cannot be removed</source>
+        <translation type="unfinished"></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>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
@@ -2045,30 +2138,35 @@ and Salvador Cuñat</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Device ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Model</source>
         <translation type="unfinished">Modelo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
         <translation type="unfinished">Nome</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <source>Clicking here will remove this divecomputer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1009"/>
+        <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1011"/>
+        <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2076,186 +2174,206 @@ and Salvador Cuñat</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="39"/>
+        <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="398"/>
+        <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="399"/>
+        <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="400"/>
-        <source>collapse</source>
+        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <source>collapse others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="402"/>
-        <source>remove dive from trip</source>
+        <location filename="../qt-ui/divelistview.cpp" line="638"/>
+        <source>remove dive(s) from trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="405"/>
-        <source>Merge trip with trip above</source>
-        <translation type="unfinished">Integrar expedição à de cima</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="639"/>
+        <source>create new trip above</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="406"/>
-        <source>Merge trip with trip below</source>
-        <translation type="unfinished">Integrar expedição à de baixo</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="640"/>
+        <source>add dive(s) to trip immideately above</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="410"/>
-        <source>delete dive</source>
+        <location filename="../qt-ui/divelistview.cpp" line="643"/>
+        <source>merge trip with trip above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="412"/>
-        <source>merge selected dives</source>
+        <location filename="../qt-ui/divelistview.cpp" line="644"/>
+        <source>merge trip with trip below</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../qt-ui/divelistview.cpp" line="648"/>
+        <source>delete dive(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
-        <source>Bottom SAC</source>
+        <location filename="../qt-ui/divelistview.cpp" line="652"/>
+        <source>save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
-        <source>High GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="653"/>
+        <source>export As UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
-        <source>SAC on DECO Stop</source>
+        <location filename="../qt-ui/divelistview.cpp" line="654"/>
+        <source>shift times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
-        <source>Low GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
+        <source>Save Dives As...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="114"/>
-        <source>Last Stop at 6m</source>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
+        <source>Save File as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="141"/>
-        <source>Start Time</source>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="148"/>
-        <source>ATM Pressure</source>
+        <source>Merge trip with trip above</source>
+        <translation type="obsolete">Integrar expedição à de cima</translation>
+    </message>
+    <message>
+        <source>Merge trip with trip below</source>
+        <translation type="obsolete">Integrar expedição à de baixo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <source>merge selected dives</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DivePlannerGraphics</name>
+    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="143"/>
-        <source>10m</source>
+        <location filename="../qt-ui/diveplanner.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="145"/>
-        <source>30ft</source>
+        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <source>Bottom SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="146"/>
-        <source>Increase maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <source>SAC on DECO Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="147"/>
-        <source>Decreases maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <source>Increase minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>10min</source>
+        <location filename="../qt-ui/diveplanner.ui" line="108"/>
+        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>Decreases minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <source>Last Stop at 6m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
-        <source>Handler Position Error</source>
+        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="386"/>
-        <source>One or more of your stops will be lost with this operations, 
-Please, remove them first.</source>
+        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <source>ATM Pressure</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DivePlannerGraphics</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <source>10m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="415"/>
-        <source>Air</source>
+        <location filename="../qt-ui/diveplanner.cpp" line="136"/>
+        <source>30ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <source>Handler Position Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="420"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="421"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="424"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="425"/>
-        <source>Air</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <source>AIR</source>
+        <translation type="unfinished">AR</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="986"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="987"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
         <translation type="unfinished">Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="988"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="989"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1141"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1142"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2263,75 +2381,85 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="851"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="937"/>
+        <source>Available Gases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <source>add dive data point</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1051"/>
+        <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
         <translation type="unfinished">#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1052"/>
+        <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
         <translation type="unfinished">Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
         <translation type="unfinished">m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
         <translation type="unfinished">pés</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1055"/>
+        <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
         <translation type="unfinished">min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
         <translation type="unfinished">libra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1058"/>
+        <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
         <translation type="unfinished">Fato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1059"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
         <translation type="unfinished">Cil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1061"/>
+        <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
         <translation type="unfinished">SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1062"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1063"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
         <translation type="unfinished">máxCNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1064"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
         <translation type="unfinished">Localização</translation>
     </message>
@@ -2339,15 +2467,21 @@ Please, remove them first.</source>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="138"/>
-        <source>Error</source>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="142"/>
-        <source>retry</source>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
+        <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
+        <source>Retry</source>
+        <translation type="unfinished">Repetir</translation>
+    </message>
 </context>
 <context>
     <name>DownloadFromDiveComputer</name>
@@ -2406,6 +2540,7 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
         <translation type="unfinished">Notas do mergulho</translation>
     </message>
@@ -2420,225 +2555,238 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <source>M/d/yy h:mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="108"/>
-        <location filename="../qt-ui/maintab.cpp" line="307"/>
+        <location filename="../qt-ui/maintab.ui" line="112"/>
+        <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
         <translation type="unfinished">Localização</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="122"/>
+        <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="136"/>
+        <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
         <translation type="unfinished">Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="143"/>
+        <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
         <translation type="unfinished">Parceiro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="166"/>
+        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
         <translation type="unfinished">Classificação</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="173"/>
+        <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
         <translation type="unfinished">Visibilidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="182"/>
+        <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
         <translation type="unfinished">Fato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="206"/>
-        <location filename="../qt-ui/maintab.cpp" line="308"/>
+        <location filename="../qt-ui/maintab.ui" line="217"/>
+        <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
         <translation type="unfinished">Notas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="232"/>
+        <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
         <translation type="unfinished">Equipamento</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="319"/>
+        <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
         <translation type="unfinished">Informação do mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="361"/>
+        <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
         <translation type="unfinished">Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="380"/>
+        <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="399"/>
+        <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="418"/>
+        <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="437"/>
-        <location filename="../qt-ui/maintab.ui" line="692"/>
+        <location filename="../qt-ui/maintab.ui" line="466"/>
+        <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
         <translation type="unfinished">SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="456"/>
+        <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="475"/>
+        <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="494"/>
+        <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="513"/>
+        <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="532"/>
+        <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="551"/>
+        <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="570"/>
+        <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
         <translation type="unfinished">Duração do mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="589"/>
+        <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
         <translation type="unfinished">Estatísticas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="668"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation type="unfinished">Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="680"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation type="unfinished">Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="704"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation type="unfinished">Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="716"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation type="unfinished">Tempo total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="735"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation type="unfinished">Mergulhos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="68"/>
+        <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
         <translation type="unfinished">Garrafas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="129"/>
-        <location filename="../qt-ui/maintab.cpp" line="131"/>
-        <source>This trip is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <source>Trip Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="137"/>
-        <location filename="../qt-ui/maintab.cpp" line="139"/>
-        <source>This dive is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="296"/>
+        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <source>Trip Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="286"/>
-        <source>Trip Location</source>
+        <location filename="../qt-ui/maintab.cpp" line="134"/>
+        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="288"/>
-        <source>Trip Notes</source>
+        <location filename="../qt-ui/maintab.cpp" line="143"/>
+        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
-        <location filename="../qt-ui/maintab.cpp" line="337"/>
-        <location filename="../qt-ui/maintab.cpp" line="338"/>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="146"/>
+        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <source>This dive is being edited. Select Save or Cancel when done.</source>
+        <translation type="unfinished"></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"/>
         <source>/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <source>unknown</source>
+        <translation type="unfinished">desconhecido</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
         <translation type="unfinished">N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
         <translation type="unfinished">S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
         <translation type="unfinished">E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
         <translation type="unfinished">O</translation>
     </message>
@@ -2651,308 +2799,428 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="177"/>
         <source>File</source>
-        <translation type="unfinished">Ficheiro</translation>
+        <translation type="obsolete">Ficheiro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="196"/>
         <source>Log</source>
-        <translation type="unfinished">Registos</translation>
+        <translation type="obsolete">Registos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="211"/>
         <source>View</source>
-        <translation type="unfinished">Ver</translation>
+        <translation type="obsolete">Ver</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="226"/>
+        <location filename="../qt-ui/mainwindow.ui" line="218"/>
         <source>Filter</source>
         <translation type="unfinished">Filtros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="232"/>
         <source>Help</source>
-        <translation type="unfinished">Ajuda</translation>
+        <translation type="obsolete">Ajuda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="245"/>
+        <location filename="../qt-ui/mainwindow.ui" line="177"/>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <source>&amp;Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <source>&amp;View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <source>&amp;Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>&amp;New logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
         <translation type="unfinished">Novo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <source>&amp;Open logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="256"/>
+        <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
+        <location filename="../qt-ui/mainwindow.ui" line="281"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation type="unfinished">Guardar como...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
+        <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="277"/>
+        <location filename="../qt-ui/mainwindow.ui" line="292"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation type="unfinished">Encerrar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="285"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="176"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <source>Export UDDF</source>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <source>Export &amp;UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
-        <source>Print</source>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <source>Ctrl+U</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="301"/>
-        <source>Ctrl+P</source>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <source>&amp;Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
-        <source>Preferences</source>
-        <translation type="unfinished">Preferências</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <source>Ctrl+,</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="311"/>
-        <source>Quit</source>
-        <translation type="unfinished">Sair</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
-        <source>Ctrl+Q</source>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <source>Import from &amp;dive computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <source>Download from Dive computer</source>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
-        <source>Ctrl+D</source>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <source>Ctrl+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="327"/>
-        <source>Download from Web Service</source>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <source>&amp;Edit Device Names</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="332"/>
-        <source>Edit Device Names</source>
-        <translation type="unfinished">Editar nomes do dispositivo</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <source>Ctrl++</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="337"/>
-        <source>Add Dive</source>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <source>&amp;Renumber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
-        <source>Renumber</source>
-        <translation type="unfinished">Alterar numeração</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Ctrl+R</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
-        <source>Auto Group</source>
+        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <source>Toggle &amp;Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
-        <source>Toggle Zoom</source>
-        <translation type="unfinished">Activar / Desactivar Zoom</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <source>&amp;Yearly Statistics</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
-        <source>Yearly Statistics</source>
-        <translation type="unfinished">Estatísticas anuais</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <source>Ctrl+Y</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
-        <source>View List</source>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Dive List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="365"/>
-        <source>Ctrl+2</source>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <source>Profile</source>
+        <translation type="unfinished">Perfil</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <source>Info</source>
+        <translation type="unfinished">Info</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
-        <source>View Profile</source>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <source>User &amp;Manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="373"/>
-        <source>Ctrl+3</source>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <source>Globe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
-        <source>View Info</source>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <source>P&amp;lan Dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="381"/>
-        <source>Ctrl+4</source>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <source>Ctrl+L</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <source>Import CSV</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <source>Import CS&amp;V</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <source>Import from Divelogs.de</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <source>Preferences</source>
+        <translation type="unfinished">Preferências</translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="obsolete">Sair</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <source>Ctrl+D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Device Names</source>
+        <translation type="obsolete">Editar nomes do dispositivo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <source>Add Dive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Renumber</source>
+        <translation type="obsolete">Alterar numeração</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/mainwindow.ui" line="386"/>
-        <source>View All</source>
+        <source>Auto Group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle Zoom</source>
+        <translation type="obsolete">Activar / Desactivar Zoom</translation>
+    </message>
+    <message>
+        <source>Yearly Statistics</source>
+        <translation type="obsolete">Estatísticas anuais</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <source>Ctrl+2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <source>Ctrl+3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="389"/>
+        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <source>Ctrl+4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>Ctrl+1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Prev DC</source>
         <translation type="unfinished">Anterior DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
+        <location filename="../qt-ui/mainwindow.ui" line="439"/>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="402"/>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Next DC</source>
         <translation type="unfinished">Seguinte DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="405"/>
+        <location filename="../qt-ui/mainwindow.ui" line="447"/>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="410"/>
+        <location filename="../qt-ui/mainwindow.ui" line="452"/>
         <source>Select Events</source>
         <translation type="unfinished">Seleccionar Eventos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
         <source>Input Plan</source>
         <translation type="unfinished">Introduzir Plano</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
         <source>About Subsurface</source>
         <translation type="unfinished">Sobre Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="425"/>
-        <source>User Manual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>F1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="433"/>
-        <source>View Globe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="478"/>
         <source>Ctrl+5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="441"/>
-        <source>Dive Planner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="108"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Open File</source>
         <translation type="unfinished">Abrir Ficheiro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="271"/>
-        <source>manually added dive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="448"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="450"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="455"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
         <translation type="unfinished">Guardar alterações?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="456"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="695"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="696"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="144"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="250"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="286"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="197"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3015,215 +3283,235 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="218"/>
+        <location filename="../qt-ui/preferences.ui" line="199"/>
+        <source>Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="205"/>
+        <source>Use Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="225"/>
+        <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="235"/>
+        <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="245"/>
+        <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="269"/>
+        <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
         <translation type="unfinished">Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="276"/>
+        <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
         <translation type="unfinished">Metro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="286"/>
+        <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
         <translation type="unfinished">Pés</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
         <translation type="unfinished">Pressão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="303"/>
+        <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
         <translation type="unfinished">Bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="313"/>
+        <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="330"/>
+        <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
         <translation type="unfinished">Litro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="340"/>
+        <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
         <translation type="unfinished">pé^3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="350"/>
+        <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
         <translation type="unfinished">Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="357"/>
+        <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
         <translation type="unfinished">Celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
         <translation type="unfinished">Fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="377"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
         <translation type="unfinished">Peso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
         <translation type="unfinished">libra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="464"/>
+        <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="472"/>
+        <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="495"/>
-        <location filename="../qt-ui/preferences.ui" line="536"/>
-        <location filename="../qt-ui/preferences.ui" line="577"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="513"/>
+        <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="554"/>
+        <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="595"/>
+        <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="618"/>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="634"/>
+        <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="643"/>
+        <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="666"/>
+        <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="677"/>
+        <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="700"/>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="710"/>
+        <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="721"/>
-        <source>Show time</source>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
+        <source>Calculate NDL/TTS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="733"/>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>Show SAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
+        <source>GFLow at max depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="739"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
-        <source>XML Files (*.xml)</source>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3361,51 +3649,86 @@ Please, remove them first.</source>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="257"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="259"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <source>Hide events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <source>Hide all %1 events?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <source>Remove the selected event?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <source>%1 @ %2:%3</source>
+        <translation type="unfinished"></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>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="337"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="383"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="384"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="582"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="850"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <source>Measure properties of dive segments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
+        <source>Scale your dive to screen size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
         <translation type="unfinished">ar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="584"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="851"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="859"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
         <translation type="unfinished">Troca de emergência para OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="861"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished">iniciar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="862"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished">fim</translation>
@@ -3414,62 +3737,62 @@ Please, remove them first.</source>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1497"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
         <translation type="unfinished">desconhecido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1502"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1505"/>
+        <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1512"/>
+        <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1517"/>
+        <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
         <translation type="unfinished">Garrafa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1519"/>
+        <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
         <translation type="unfinished">Mistura de gás</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
         <translation type="unfinished">Gás usado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1547"/>
+        <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
         <translation type="unfinished">SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1549"/>
+        <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
         <translation type="unfinished">Máx. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1551"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1564"/>
+        <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1570"/>
+        <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3478,30 +3801,30 @@ Please, remove them first.</source>
     <name>QObject</name>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="44"/>
         <source>AIR</source>
         <translation type="unfinished">AR</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="38"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="45"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="723"/>
+        <source>Remove this Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>EAN32</source>
-        <translation type="unfinished">EAN32</translation>
+        <translation type="obsolete">EAN32</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="46"/>
         <source>EAN36</source>
-        <translation type="unfinished">EAN36</translation>
+        <translation type="obsolete">EAN36</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="47"/>
-        <source>Choose Gas</source>
+        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <source>No location data - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="188"/>
-        <source>No location data - move the map and double-click to set the dive location</source>
+        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3510,17 +3833,17 @@ Please, remove them first.</source>
         <translation type="unfinished">Encerrar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="26"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation type="unfinished">Média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="29"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3539,92 +3862,95 @@ Please, remove them first.</source>
     </message>
 </context>
 <context>
-    <name>SubsurfaceAbout</name>
+    <name>ShiftTimesDialog</name>
     <message>
-        <location filename="../qt-ui/about.ui" line="23"/>
-        <source>About Subsurface</source>
-        <translation type="unfinished">Sobre Subsurface</translation>
+        <location filename="../qt-ui/shifttimes.ui" line="14"/>
+        <source>Shift selected times</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
+        <location filename="../qt-ui/shifttimes.ui" line="35"/>
+        <source>Shift times of selected dives by</source>
         <translation type="unfinished"></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>
+        <location filename="../qt-ui/shifttimes.ui" line="80"/>
+        <source>h:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="22"/>
-        <source>&amp;License</source>
+        <location filename="../qt-ui/shifttimes.ui" line="90"/>
+        <source>earlier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
-        <source>&amp;Website</source>
+        <location filename="../qt-ui/shifttimes.ui" line="97"/>
+        <source>later</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SubsurfaceWebServices</name>
+    <name>SubsurfaceAbout</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="14"/>
-        <source>Download Location Data</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/about.ui" line="23"/>
+        <source>About Subsurface</source>
+        <translation type="unfinished">Sobre Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="37"/>
-        <source>Download</source>
+        <location filename="../qt-ui/about.ui" line="64"/>
+        <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="44"/>
-        <source>Enter your ID here</source>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="51"/>
-        <source>User ID</source>
+        <location filename="../qt-ui/about.cpp" line="22"/>
+        <source>&amp;License</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="58"/>
-        <source>Status:</source>
+        <location filename="../qt-ui/about.cpp" line="23"/>
+        <source>&amp;Website</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="49"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
         <translation type="unfinished">Serviço web</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="90"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="106"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="130"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
         <translation type="unfinished">Erro de ligação:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
         <translation type="unfinished">Identificação de utilizador inválida !</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
         <translation type="unfinished">Não consigo analisar a resposta !</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="133"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
         <translation type="unfinished">Operação de transferência bem sucedida!</translation>
     </message>
@@ -3645,17 +3971,17 @@ Please, remove them first.</source>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Bar</source>
         <translation type="unfinished">Bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3663,7 +3989,7 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1393"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3671,96 +3997,139 @@ Please, remove them first.</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>WebServices</name>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="14"/>
+        <source>Download Location Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="20"/>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="27"/>
+        <source>Enter your ID here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="34"/>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="58"/>
+        <source>User ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="72"/>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="86"/>
+        <source>Upload</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
         <translation type="unfinished">Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
         <translation type="unfinished">Peso</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="460"/>
+        <source>Clicking here will remove this weigthsystem.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
- &gt; Month</source>
+ &gt; Month / Trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
         <translation type="unfinished">#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1307"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1310"/>
+        <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1311"/>
+        <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1312"/>
-        <location filename="../qt-ui/models.cpp" line="1315"/>
-        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <location filename="../qt-ui/models.cpp" line="1418"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1313"/>
-        <location filename="../qt-ui/models.cpp" line="1316"/>
-        <location filename="../qt-ui/models.cpp" line="1319"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"></translation>
@@ -3769,91 +4138,74 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="44"/>
+        <location filename="../dive.c" line="57"/>
         <source>pascal</source>
         <translation type="unfinished">pascal</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="48"/>
-        <location filename="../qt-gui.cpp" line="323"/>
+        <location filename="../dive.c" line="61"/>
+        <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
         <translation type="unfinished">bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="52"/>
-        <location filename="../qt-gui.cpp" line="326"/>
+        <location filename="../dive.c" line="65"/>
+        <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
         <translation type="unfinished">psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="88"/>
-        <location filename="../qt-gui.cpp" line="304"/>
+        <location filename="../dive.c" line="101"/>
+        <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
         <translation type="unfinished">l</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="93"/>
-        <location filename="../qt-gui.cpp" line="307"/>
+        <location filename="../dive.c" line="106"/>
+        <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
         <translation type="unfinished">pés^3</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="121"/>
-        <location filename="../qt-gui.cpp" line="207"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
         <translation type="unfinished">m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="126"/>
-        <location filename="../qt-gui.cpp" line="210"/>
+        <location filename="../dive.c" line="139"/>
+        <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
         <translation type="unfinished">pés</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="170"/>
-        <location filename="../qt-gui.cpp" line="233"/>
+        <location filename="../dive.c" line="183"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
         <translation type="unfinished">libra</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
-        <location filename="../qt-gui.cpp" line="231"/>
+        <location filename="../dive.c" line="187"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="966"/>
+        <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
         <translation type="unfinished">(%s) ou (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="473"/>
         <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <translation type="unfinished">%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="490"/>
-        <source>%1$s %2$d, %3$d
-%4$02d:%5$02d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="512"/>
-        <source>%1$s %2$d (%3$d dives)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="519"/>
-        <source>%1$s %2$d (1 dive)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="550"/>
-        <location filename="../planner.c" line="94"/>
-        <location filename="../planner.c" line="748"/>
-        <location filename="../planner.c" line="749"/>
-        <location filename="../statistics.c" line="360"/>
-        <location filename="../statistics.c" line="371"/>
+        <location filename="../divelist.c" line="488"/>
+        <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"/>
         <source>air</source>
         <translation type="unfinished">ar</translation>
     </message>
@@ -3883,308 +4235,320 @@ Maximum</source>
         <translation type="unfinished">clip-on</translation>
     </message>
     <message>
-        <location filename="../file.c" line="106"/>
-        <location filename="../file.c" line="108"/>
-        <location filename="../file.c" line="303"/>
-        <location filename="../file.c" line="305"/>
+        <location filename="../file.c" line="107"/>
+        <location filename="../file.c" line="109"/>
+        <location filename="../file.c" line="308"/>
+        <location filename="../file.c" line="310"/>
+        <location filename="../file.c" line="390"/>
+        <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation type="unfinished">Falha na leitura de &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <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>
+    </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>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
         <translation type="unfinished">nenhum</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
         <translation type="unfinished">paragem de deco</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
         <translation type="unfinished">rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
         <translation type="unfinished">subida</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
         <translation type="unfinished">tecto</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
         <translation type="unfinished">carga</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
         <translation type="unfinished">transmissor</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
         <translation type="unfinished">transgressão</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
         <translation type="unfinished">favorito</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
         <translation type="unfinished">superfície</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
         <translation type="unfinished">paragem de segurança</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
         <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
         <translation type="unfinished">mudança de gás</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
         <translation type="unfinished">paragem de segurança (voluntária)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
         <translation type="unfinished">paragem de segurança (obrigatória)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
         <translation type="unfinished">paragem de profundidade</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
         <translation type="unfinished">tecto (paragem de segurança)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
         <translation type="unfinished">duração do mergulho</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
         <translation type="unfinished">Profundidade Máx</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
         <translation type="unfinished">OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
         <translation type="unfinished">PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
         <translation type="unfinished">tempo de ar</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
         <translation type="unfinished">rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
         <translation type="unfinished">cabeçalho</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
         <translation type="unfinished">Alarme do nível nos tecidos</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
         <translation type="unfinished">tempo sem paragem</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="157"/>
+        <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
         <translation type="unfinished">Número de evento inválido</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="390"/>
+        <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
         <translation type="unfinished">Não é possivel criar o &quot;parser&quot; para %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="396"/>
+        <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
         <translation type="unfinished">Erro no registo de dados</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="405"/>
+        <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
         <translation type="unfinished">Erro na análise da data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
         <translation type="unfinished">Mergulho #%d:%s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="427"/>
+        <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
         <translation type="unfinished">Erro na análise do tempo de mergulho</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="437"/>
+        <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
         <translation type="unfinished">Erro na análise da profundidade máxima</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="447"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
         <translation type="unfinished">Erro na análise na contagem da mistura de gás</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
         <translation type="unfinished">Erro na obtenção da salinidade da água.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="469"/>
+        <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
         <translation type="unfinished">Erro na análise da mistura de gás</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
         <translation type="unfinished">Erro na análise das amostras</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="613"/>
+        <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
         <translation type="unfinished">Evento: à espera de acção do utilizador</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="621"/>
+        <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation type="unfinished">modelo=%u (0x%08x), firmware=%u (0x%08x), Nº de série=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="663"/>
+        <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
         <translation type="unfinished">Erro no registo do &quot;event handler&quot;.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="668"/>
+        <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished">Erro no registo do &quot;cancellation handler&quot;.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="672"/>
+        <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
         <translation type="unfinished">Erro na importação dos dados do mergulho</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="690"/>
+        <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished">Não é possivel criar contexto do libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished">Não se consegue abrir  %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="549"/>
+        <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1695"/>
+        <location filename="../parse-xml.c" line="1717"/>
         <source>Failed to parse &apos;%s&apos;.
 </source>
         <translation type="unfinished">Falha na análise de &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1696"/>
+        <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation type="unfinished">Falha na análise de &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1894"/>
+        <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1929"/>
+        <location filename="../parse-xml.c" line="1951"/>
         <source>Database connection failed &apos;%s&apos;.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1936"/>
+        <location filename="../parse-xml.c" line="1958"/>
         <source>Database query failed &apos;%s&apos;.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2048"/>
+        <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="96"/>
-        <location filename="../statistics.c" line="363"/>
+        <location filename="../planner.c" line="98"/>
+        <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
         <translation type="unfinished">EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="131"/>
+        <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation type="unfinished">Não encontro o gás %d/%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="192"/>
         <source>Cylinder for planning</source>
-        <translation type="unfinished">Garrafa para planear</translation>
+        <translation type="obsolete">Garrafa para planear</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="217"/>
         <source>Simulated Dive</source>
-        <translation type="unfinished">Mergulho simulado</translation>
+        <translation type="obsolete">Mergulho simulado</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="294"/>
+        <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
         <translation type="unfinished">Demasiadas misturas de gás</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="472"/>
+        <location filename="../planner.c" line="493"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -4197,180 +4561,173 @@ baseado em GFinferior = %.0f  y  GFsuperior = %.0f
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="513"/>
+        <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished">Transição de cota %.*f %s em %d:%02d min - runtime %d:%02u com %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="522"/>
+        <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished">Permanecer a  %.*f %s durante %d:%02d min - runtime %d:%02u a %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
         <translation type="unfinished">Alterar gás para %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
         <translation type="unfinished">Consumo de gás:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="552"/>
+        <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
         <translation type="unfinished">%.0f%s de %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="776"/>
         <source>ean</source>
         <translation type="unfinished">ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1154"/>
         <source>D:%.1f %s</source>
-        <translation type="unfinished">P:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1158"/>
-        <source>%s
-T:%d:%02d</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">P:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
         <translation type="unfinished">%s
 P:%d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
         <translation type="unfinished">%s
 T:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1177"/>
+        <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation type="unfinished">%s
 Tecto calculado %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1189"/>
+        <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation type="unfinished">%s
 Paragem de segurança:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1199"/>
+        <source>@:%d:%02d
+D:%.1f %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1219"/>
+        <source>%s
+SAC:%2.1fl/min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation type="unfinished">%s
 Paragem de segurança:tempo desconhecido @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation type="unfinished">%s
 Deco:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1211"/>
+        <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation type="unfinished">%s
 Deco:Tempo desconhecido @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1217"/>
+        <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
         <translation type="unfinished">%s
 Em deco</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
-        <source>%s
-NDL:-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1275"/>
         <source>%s
 NDL:%umin</source>
         <translation type="unfinished">%s
 NDL:%umin</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
-        <source>%s
-TTS:%umin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1223"/>
         <source>%s
 CNS:%u%%</source>
         <translation type="unfinished">%s
 CNS:%u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1227"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation type="unfinished">%s
 pO%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1231"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation type="unfinished">%s
 pN%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1243"/>
+        <location filename="../profile.c" line="1235"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation type="unfinished">%s
 pHe:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1240"/>
         <source>%s
 MOD:%d%s</source>
         <translation type="unfinished">%s
 MOD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1247"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -4381,295 +4738,330 @@ PNE:%d%s
 EADD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1349"/>
+        <location filename="../profile.c" line="1280"/>
+        <source>%s
+Deco:%umin @ %.0f %s (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1289"/>
+        <source>%s
+In deco (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>%s
+NDL:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1296"/>
+        <source>%s
+TTS:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
-        <location filename="../profile.c" line="1357"/>
+        <location filename="../profile.c" line="1409"/>
+        <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1361"/>
+        <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1365"/>
+        <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1369"/>
-        <source>%s%sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1425"/>
+        <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1373"/>
-        <location filename="../profile.c" line="1377"/>
-        <source>%s %sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1429"/>
+        <location filename="../profile.c" line="1433"/>
+        <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1384"/>
+        <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="284"/>
+        <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="288"/>
+        <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
-        <source>invalid</source>
+        <location filename="../qt-gui.cpp" line="460"/>
+        <source>%1, %2 %3, %4 %5:%6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../qt-gui.cpp" line="473"/>
+        <source>%1 %2, %3
+%4:%5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="486"/>
+        <source>%1 %2 (%3 dives)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="491"/>
+        <source>%1 %2 (1 dive)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="13"/>
         <source>boat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>shore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>drift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>deep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>cavern</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="14"/>
         <source>ice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>wreck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>cave</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>altitude</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>pool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>lake</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="16"/>
         <source>river</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="17"/>
         <source>night</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
-        <source>freshwater</source>
+        <location filename="../dive.c" line="17"/>
+        <source>fresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
-        <source>training</source>
+        <location filename="../dive.c" line="17"/>
+        <source>student</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
-        <source>teaching</source>
+        <location filename="../dive.c" line="18"/>
+        <source>photo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
-        <source>photo</source>
+        <location filename="../dive.c" line="18"/>
+        <source>video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
-        <source>video</source>
+        <location filename="../dive.c" line="18"/>
+        <source>instructor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="19"/>
         <source>deco</source>
         <translation type="unfinished">deco</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="199"/>
+        <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
         <translation type="unfinished">mais de %d dias</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="205"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation type="unfinished">%dd, %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="207"/>
+        <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
         <translation type="unfinished">%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="218"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation type="unfinished">para mergulhos #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="225"/>
+        <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
         <translation type="unfinished">para mergulhos seleccionados</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="260"/>
+        <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
         <translation type="unfinished">para mergulho #%d -</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="262"/>
+        <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
         <translation type="unfinished">para mergulho seleccionado</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="264"/>
+        <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
         <translation type="unfinished">para todos os mergulhos</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="266"/>
+        <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
         <translation type="unfinished">(nenhum mergulho)</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="363"/>
-        <source>, EAN%d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
         <translation type="unfinished">Dom</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
         <translation type="unfinished">Seg</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
         <translation type="unfinished">Ter</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
         <translation type="unfinished">Qua</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
         <translation type="unfinished">Qui</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
         <translation type="unfinished">Sex</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
         <translation type="unfinished">Sáb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
         <translation type="unfinished">Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
         <translation type="unfinished">Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
         <translation type="unfinished">Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
         <translation type="unfinished">Abr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
         <translation type="unfinished">Maio</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
         <translation type="unfinished">Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
         <translation type="unfinished">Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
         <translation type="unfinished">Ago</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
         <translation type="unfinished">Set</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
         <translation type="unfinished">Out</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
         <translation type="unfinished">Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
         <translation type="unfinished">Dez</translation>
     </message>
diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts
index 91a4c4214..b57c38eb1 100644
--- a/translations/subsurface_ru_RU.ts
+++ b/translations/subsurface_ru_RU.ts
@@ -2314,42 +2314,135 @@ tranlators here
     </message>
 </context>
 <context>
+    <name>CSVImportDialog</name>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <source>Import File (CSV)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <source>Field Separator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <source>Field Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <source>Time</source>
+        <translation type="unfinished">Время</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <source>Depth</source>
+        <translation type="unfinished">Глуб.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <source>Temp</source>
+        <translation type="unfinished">Темп.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
+        <source>Po2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <source>Cns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <source>Stopdepth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <source>Pre-configured imports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>Open CSV Log File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>CSV Files (*.csv)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
         <translation type="unfinished">Тип</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
         <translation type="unfinished">Объем</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="65"/>
+        <source>Switch at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="163"/>
+        <source>Clicking here will remove this cylinder.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="385"/>
+        <source>Cylinder cannot be removed</source>
+        <translation type="unfinished"></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>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
@@ -2373,30 +2466,35 @@ tranlators here
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Device ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Model</source>
         <translation type="unfinished">Модель</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
         <translation type="unfinished">Имя устройства</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <source>Clicking here will remove this divecomputer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1009"/>
+        <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1011"/>
+        <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2404,186 +2502,206 @@ tranlators here
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="39"/>
+        <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="398"/>
+        <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="399"/>
+        <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="400"/>
-        <source>collapse</source>
+        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <source>collapse others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="402"/>
-        <source>remove dive from trip</source>
+        <location filename="../qt-ui/divelistview.cpp" line="638"/>
+        <source>remove dive(s) from trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="405"/>
-        <source>Merge trip with trip above</source>
-        <translation type="unfinished">Объединить с поездкой выше</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="639"/>
+        <source>create new trip above</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="406"/>
-        <source>Merge trip with trip below</source>
-        <translation type="unfinished">Объединить с поездкой ниже</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="640"/>
+        <source>add dive(s) to trip immideately above</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="410"/>
-        <source>delete dive</source>
+        <location filename="../qt-ui/divelistview.cpp" line="643"/>
+        <source>merge trip with trip above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="412"/>
-        <source>merge selected dives</source>
+        <location filename="../qt-ui/divelistview.cpp" line="644"/>
+        <source>merge trip with trip below</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../qt-ui/divelistview.cpp" line="648"/>
+        <source>delete dive(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
-        <source>Bottom SAC</source>
+        <location filename="../qt-ui/divelistview.cpp" line="652"/>
+        <source>save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
-        <source>High GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="653"/>
+        <source>export As UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
-        <source>SAC on DECO Stop</source>
+        <location filename="../qt-ui/divelistview.cpp" line="654"/>
+        <source>shift times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
-        <source>Low GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
+        <source>Save Dives As...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="114"/>
-        <source>Last Stop at 6m</source>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
+        <source>Save File as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="141"/>
-        <source>Start Time</source>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="148"/>
-        <source>ATM Pressure</source>
+        <source>Merge trip with trip above</source>
+        <translation type="obsolete">Объединить с поездкой выше</translation>
+    </message>
+    <message>
+        <source>Merge trip with trip below</source>
+        <translation type="obsolete">Объединить с поездкой ниже</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <source>merge selected dives</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DivePlannerGraphics</name>
+    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="143"/>
-        <source>10m</source>
+        <location filename="../qt-ui/diveplanner.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="145"/>
-        <source>30ft</source>
+        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <source>Bottom SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="146"/>
-        <source>Increase maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <source>SAC on DECO Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="147"/>
-        <source>Decreases maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <source>Increase minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>10min</source>
+        <location filename="../qt-ui/diveplanner.ui" line="108"/>
+        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>Decreases minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <source>Last Stop at 6m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
-        <source>Handler Position Error</source>
+        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="386"/>
-        <source>One or more of your stops will be lost with this operations, 
-Please, remove them first.</source>
+        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <source>ATM Pressure</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DivePlannerGraphics</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <source>10m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="136"/>
+        <source>30ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <source>Handler Position Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="415"/>
-        <source>Air</source>
+        <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>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="420"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="421"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="424"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="425"/>
-        <source>Air</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <source>AIR</source>
+        <translation type="unfinished">воздух</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="986"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="987"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
         <translation type="unfinished">Длительность</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="988"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="989"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1141"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1142"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2591,75 +2709,85 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="851"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="937"/>
+        <source>Available Gases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <source>add dive data point</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1051"/>
+        <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
         <translation type="unfinished">№</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1052"/>
+        <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
         <translation type="unfinished">Дата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
         <translation type="unfinished">м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
         <translation type="unfinished">фут</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1055"/>
+        <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
         <translation type="unfinished">мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
         <translation type="unfinished">кг</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
         <translation type="unfinished">фунт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1058"/>
+        <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
         <translation type="unfinished">Костюм</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1059"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
         <translation type="unfinished">Баллон</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1061"/>
+        <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
         <translation type="unfinished">SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1062"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1063"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
         <translation type="unfinished">макс.CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1064"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
         <translation type="unfinished">Местонахождение</translation>
     </message>
@@ -2667,14 +2795,20 @@ Please, remove them first.</source>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="138"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
         <translation type="unfinished">Ошибка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="142"/>
-        <source>retry</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
+        <source>Retry</source>
+        <translation type="unfinished">Повторить</translation>
     </message>
 </context>
 <context>
@@ -2734,6 +2868,7 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
         <translation type="unfinished">Погружение</translation>
     </message>
@@ -2748,225 +2883,238 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <source>M/d/yy h:mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="108"/>
-        <location filename="../qt-ui/maintab.cpp" line="307"/>
+        <location filename="../qt-ui/maintab.ui" line="112"/>
+        <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
         <translation type="unfinished">Местонахождение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="122"/>
+        <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="136"/>
+        <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
         <translation type="unfinished">Инструктор</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="143"/>
+        <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
         <translation type="unfinished">Партнер</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="166"/>
+        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
         <translation type="unfinished">Оценка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="173"/>
+        <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
         <translation type="unfinished">Видимость</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="182"/>
+        <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
         <translation type="unfinished">Костюм</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="206"/>
-        <location filename="../qt-ui/maintab.cpp" line="308"/>
+        <location filename="../qt-ui/maintab.ui" line="217"/>
+        <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
         <translation type="unfinished">Примечания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="232"/>
+        <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
         <translation type="unfinished">Снаряжение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="319"/>
+        <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
         <translation type="unfinished">Информация</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="361"/>
+        <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
         <translation type="unfinished">Дата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="380"/>
+        <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="399"/>
+        <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="418"/>
+        <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="437"/>
-        <location filename="../qt-ui/maintab.ui" line="692"/>
+        <location filename="../qt-ui/maintab.ui" line="466"/>
+        <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
         <translation type="unfinished">SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="456"/>
+        <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="475"/>
+        <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="494"/>
+        <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="513"/>
+        <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="532"/>
+        <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="551"/>
+        <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="570"/>
+        <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
         <translation type="unfinished">Время погр.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="589"/>
+        <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
         <translation type="unfinished">Статистика</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="668"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation type="unfinished">Глуб.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="680"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation type="unfinished">Температура</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="704"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation type="unfinished">Длительность</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="716"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation type="unfinished">Общее время</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="735"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation type="unfinished">Погружения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="68"/>
+        <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
         <translation type="unfinished">Баллоны</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="129"/>
-        <location filename="../qt-ui/maintab.cpp" line="131"/>
-        <source>This trip is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <source>Trip Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="137"/>
-        <location filename="../qt-ui/maintab.cpp" line="139"/>
-        <source>This dive is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="296"/>
+        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <source>Trip Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="286"/>
-        <source>Trip Location</source>
+        <location filename="../qt-ui/maintab.cpp" line="134"/>
+        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="288"/>
-        <source>Trip Notes</source>
+        <location filename="../qt-ui/maintab.cpp" line="143"/>
+        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
-        <location filename="../qt-ui/maintab.cpp" line="337"/>
-        <location filename="../qt-ui/maintab.cpp" line="338"/>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="146"/>
+        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <source>This dive is being edited. Select Save or Cancel when done.</source>
+        <translation type="unfinished"></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"/>
         <source>/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <source>unknown</source>
+        <translation type="unfinished">неизвестно</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
         <translation type="unfinished">С</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
         <translation type="unfinished">Ю</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
         <translation type="unfinished">В</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
         <translation type="unfinished">З</translation>
     </message>
@@ -2979,308 +3127,432 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="177"/>
         <source>File</source>
-        <translation type="unfinished">Файл</translation>
+        <translation type="obsolete">Файл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="196"/>
         <source>Log</source>
-        <translation type="unfinished">Журнал</translation>
+        <translation type="obsolete">Журнал</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="211"/>
         <source>View</source>
-        <translation type="unfinished">Вид</translation>
+        <translation type="obsolete">Вид</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="226"/>
+        <location filename="../qt-ui/mainwindow.ui" line="218"/>
         <source>Filter</source>
         <translation type="unfinished">Фильтр</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="232"/>
         <source>Help</source>
-        <translation type="unfinished">Справка</translation>
+        <translation type="obsolete">Справка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="245"/>
+        <location filename="../qt-ui/mainwindow.ui" line="177"/>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <source>&amp;Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <source>&amp;View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <source>&amp;Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>&amp;New logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
         <translation type="unfinished">Новый</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <source>&amp;Open logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="256"/>
+        <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
+        <location filename="../qt-ui/mainwindow.ui" line="281"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation type="unfinished">Сохранить как</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
+        <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="277"/>
+        <location filename="../qt-ui/mainwindow.ui" line="292"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation type="unfinished">Закрыть</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="285"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="176"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <source>Export UDDF</source>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <source>Export &amp;UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
-        <source>Print</source>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <source>Ctrl+U</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="301"/>
-        <source>Ctrl+P</source>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <source>&amp;Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
-        <source>Preferences</source>
-        <translation type="unfinished">Предпочтения</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <source>Ctrl+,</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="311"/>
-        <source>Quit</source>
-        <translation type="unfinished">Выход</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
-        <source>Ctrl+Q</source>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <source>Import from &amp;dive computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <source>Download from Dive computer</source>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
-        <source>Ctrl+D</source>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <source>Ctrl+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="327"/>
-        <source>Download from Web Service</source>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <source>&amp;Edit Device Names</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="332"/>
-        <source>Edit Device Names</source>
-        <translation type="unfinished">Список дайвкомпьютеров</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <source>Ctrl++</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="337"/>
-        <source>Add Dive</source>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <source>&amp;Renumber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
-        <source>Renumber</source>
-        <translation type="unfinished">Перенумеровать</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Ctrl+R</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
-        <source>Auto Group</source>
+        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <source>Toggle &amp;Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
-        <source>Toggle Zoom</source>
-        <translation type="unfinished">Изменить масштаб</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <source>&amp;Yearly Statistics</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
-        <source>Yearly Statistics</source>
-        <translation type="unfinished">Статистика за год</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <source>Ctrl+Y</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
-        <source>View List</source>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Dive List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="365"/>
-        <source>Ctrl+2</source>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <source>Profile</source>
+        <translation type="unfinished">Профиль</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <source>Info</source>
+        <translation type="unfinished">Информация</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
-        <source>View Profile</source>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <source>User &amp;Manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="373"/>
-        <source>Ctrl+3</source>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <source>Globe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
-        <source>View Info</source>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <source>P&amp;lan Dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="381"/>
-        <source>Ctrl+4</source>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <source>Ctrl+L</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <source>Import CSV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <source>Import CS&amp;V</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <source>Import from Divelogs.de</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <source>Preferences</source>
+        <translation type="unfinished">Предпочтения</translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="obsolete">Выход</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <source>Ctrl+D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Device Names</source>
+        <translation type="obsolete">Список дайвкомпьютеров</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <source>Add Dive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Renumber</source>
+        <translation type="obsolete">Перенумеровать</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/mainwindow.ui" line="386"/>
-        <source>View All</source>
+        <source>Auto Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="389"/>
+        <source>Toggle Zoom</source>
+        <translation type="obsolete">Изменить масштаб</translation>
+    </message>
+    <message>
+        <source>Yearly Statistics</source>
+        <translation type="obsolete">Статистика за год</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <source>Ctrl+2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <source>Ctrl+3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <source>Ctrl+4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>Ctrl+1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Prev DC</source>
         <translation type="unfinished">Пред. ДК</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
+        <location filename="../qt-ui/mainwindow.ui" line="439"/>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="402"/>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Next DC</source>
         <translation type="unfinished">След. ДК</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="405"/>
+        <location filename="../qt-ui/mainwindow.ui" line="447"/>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="410"/>
+        <location filename="../qt-ui/mainwindow.ui" line="452"/>
         <source>Select Events</source>
         <translation type="unfinished">Выбрать события</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
         <source>Input Plan</source>
         <translation type="unfinished">Ввести план</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
         <source>About Subsurface</source>
         <translation type="unfinished">О Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>User Manual</source>
-        <translation type="unfinished">Руководство пользователя</translation>
+        <translation type="obsolete">Руководство пользователя</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>F1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="433"/>
-        <source>View Globe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="478"/>
         <source>Ctrl+5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="441"/>
-        <source>Dive Planner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="108"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Open File</source>
         <translation type="unfinished">Открыть файл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="271"/>
-        <source>manually added dive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="448"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="450"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="455"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
         <translation type="unfinished">Сохранить изменения?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="456"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="695"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="696"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="144"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="250"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="286"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="197"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3343,215 +3615,235 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="218"/>
+        <location filename="../qt-ui/preferences.ui" line="199"/>
+        <source>Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="205"/>
+        <source>Use Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="225"/>
+        <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="235"/>
+        <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="245"/>
+        <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="269"/>
+        <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
         <translation type="unfinished">Глуб.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="276"/>
+        <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
         <translation type="unfinished">Метр</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="286"/>
+        <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
         <translation type="unfinished">Фут</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
         <translation type="unfinished">Давление</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="303"/>
+        <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
         <translation type="unfinished">Бар</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="313"/>
+        <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="330"/>
+        <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
         <translation type="unfinished">Литр</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="340"/>
+        <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
         <translation type="unfinished">куб. фут</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="350"/>
+        <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
         <translation type="unfinished">Температура</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="357"/>
+        <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
         <translation type="unfinished">Цельсий</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
         <translation type="unfinished">Фаренгейт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="377"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
         <translation type="unfinished">Груз</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
         <translation type="unfinished">фунт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="464"/>
+        <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="472"/>
+        <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="495"/>
-        <location filename="../qt-ui/preferences.ui" line="536"/>
-        <location filename="../qt-ui/preferences.ui" line="577"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="513"/>
+        <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="554"/>
+        <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="595"/>
+        <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="618"/>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="634"/>
+        <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="643"/>
+        <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="666"/>
+        <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="677"/>
+        <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="700"/>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="710"/>
+        <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="721"/>
-        <source>Show time</source>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
+        <source>Calculate NDL/TTS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="733"/>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>Show SAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
+        <source>GFLow at max depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="739"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
-        <source>XML Files (*.xml)</source>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3689,51 +3981,86 @@ Please, remove them first.</source>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="257"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="259"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <source>Hide events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <source>Hide all %1 events?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <source>Remove the selected event?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <source>%1 @ %2:%3</source>
+        <translation type="unfinished"></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>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="337"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="383"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="384"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="582"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="850"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <source>Measure properties of dive segments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
+        <source>Scale your dive to screen size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
+        <source>Edit</source>
+        <translation type="unfinished">Редактировать</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
         <translation type="unfinished">воздух</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="584"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="851"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="859"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
         <translation type="unfinished">Переход на Откр. Цикл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="861"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished"> начало</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="862"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished"> конец</translation>
@@ -3742,62 +4069,62 @@ Please, remove them first.</source>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1497"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
         <translation type="unfinished">неизвестно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1502"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1505"/>
+        <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1512"/>
+        <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1517"/>
+        <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
         <translation type="unfinished">Баллон</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1519"/>
+        <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
         <translation type="unfinished">Смесь</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1547"/>
+        <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
         <translation type="unfinished">SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1549"/>
+        <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
         <translation type="unfinished">Макс. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1551"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1564"/>
+        <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1570"/>
+        <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3806,30 +4133,30 @@ Please, remove them first.</source>
     <name>QObject</name>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="44"/>
         <source>AIR</source>
         <translation type="unfinished">воздух</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="38"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="45"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="723"/>
+        <source>Remove this Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>EAN32</source>
-        <translation type="unfinished">EAN32</translation>
+        <translation type="obsolete">EAN32</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="46"/>
         <source>EAN36</source>
-        <translation type="unfinished">EAN36</translation>
+        <translation type="obsolete">EAN36</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="47"/>
-        <source>Choose Gas</source>
+        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <source>No location data - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="188"/>
-        <source>No location data - move the map and double-click to set the dive location</source>
+        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3838,17 +4165,17 @@ Please, remove them first.</source>
         <translation type="unfinished">Закрыть</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="26"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="29"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation type="unfinished">Минимум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation type="unfinished">Максимум</translation>
     </message>
@@ -3867,92 +4194,95 @@ Please, remove them first.</source>
     </message>
 </context>
 <context>
-    <name>SubsurfaceAbout</name>
+    <name>ShiftTimesDialog</name>
     <message>
-        <location filename="../qt-ui/about.ui" line="23"/>
-        <source>About Subsurface</source>
-        <translation type="unfinished">О Subsurface</translation>
+        <location filename="../qt-ui/shifttimes.ui" line="14"/>
+        <source>Shift selected times</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
+        <location filename="../qt-ui/shifttimes.ui" line="35"/>
+        <source>Shift times of selected dives by</source>
         <translation type="unfinished"></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>
+        <location filename="../qt-ui/shifttimes.ui" line="80"/>
+        <source>h:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="22"/>
-        <source>&amp;License</source>
+        <location filename="../qt-ui/shifttimes.ui" line="90"/>
+        <source>earlier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
-        <source>&amp;Website</source>
+        <location filename="../qt-ui/shifttimes.ui" line="97"/>
+        <source>later</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SubsurfaceWebServices</name>
+    <name>SubsurfaceAbout</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="14"/>
-        <source>Download Location Data</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/about.ui" line="23"/>
+        <source>About Subsurface</source>
+        <translation type="unfinished">О Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="37"/>
-        <source>Download</source>
+        <location filename="../qt-ui/about.ui" line="64"/>
+        <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="44"/>
-        <source>Enter your ID here</source>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="51"/>
-        <source>User ID</source>
+        <location filename="../qt-ui/about.cpp" line="22"/>
+        <source>&amp;License</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="58"/>
-        <source>Status:</source>
+        <location filename="../qt-ui/about.cpp" line="23"/>
+        <source>&amp;Website</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="49"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
         <translation type="unfinished">Вебсервис</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="90"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="106"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="130"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
         <translation type="unfinished">Ошибка соединения:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
         <translation type="unfinished">Неверный идентификатор пользователя!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
         <translation type="unfinished">Невозможно разобрать ответ!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="133"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
         <translation type="unfinished">Успешная загрузка!</translation>
     </message>
@@ -3973,17 +4303,17 @@ Please, remove them first.</source>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Bar</source>
         <translation type="unfinished">Бар</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3991,7 +4321,7 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1393"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3999,96 +4329,139 @@ Please, remove them first.</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>kg</source>
         <translation type="unfinished">кг</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>WebServices</name>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="14"/>
+        <source>Download Location Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="20"/>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="27"/>
+        <source>Enter your ID here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="34"/>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="58"/>
+        <source>User ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="72"/>
+        <source>Password</source>
+        <translation type="unfinished">Пароль</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="86"/>
+        <source>Upload</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
         <translation type="unfinished">Тип</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
         <translation type="unfinished">Груз</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="460"/>
+        <source>Clicking here will remove this weigthsystem.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
- &gt; Month</source>
+ &gt; Month / Trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
         <translation type="unfinished">№</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1307"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1310"/>
+        <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1311"/>
+        <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1312"/>
-        <location filename="../qt-ui/models.cpp" line="1315"/>
-        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <location filename="../qt-ui/models.cpp" line="1418"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1313"/>
-        <location filename="../qt-ui/models.cpp" line="1316"/>
-        <location filename="../qt-ui/models.cpp" line="1319"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"></translation>
@@ -4097,91 +4470,74 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="44"/>
+        <location filename="../dive.c" line="57"/>
         <source>pascal</source>
         <translation type="unfinished">Па</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="48"/>
-        <location filename="../qt-gui.cpp" line="323"/>
+        <location filename="../dive.c" line="61"/>
+        <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
         <translation type="unfinished">Бар</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="52"/>
-        <location filename="../qt-gui.cpp" line="326"/>
+        <location filename="../dive.c" line="65"/>
+        <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
         <translation type="unfinished">psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="88"/>
-        <location filename="../qt-gui.cpp" line="304"/>
+        <location filename="../dive.c" line="101"/>
+        <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
         <translation type="unfinished">л</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="93"/>
-        <location filename="../qt-gui.cpp" line="307"/>
+        <location filename="../dive.c" line="106"/>
+        <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
         <translation type="unfinished">куб. фут</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="121"/>
-        <location filename="../qt-gui.cpp" line="207"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
         <translation type="unfinished">м</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="126"/>
-        <location filename="../qt-gui.cpp" line="210"/>
+        <location filename="../dive.c" line="139"/>
+        <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
         <translation type="unfinished">фут</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="170"/>
-        <location filename="../qt-gui.cpp" line="233"/>
+        <location filename="../dive.c" line="183"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
         <translation type="unfinished">фунт</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
-        <location filename="../qt-gui.cpp" line="231"/>
+        <location filename="../dive.c" line="187"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
         <translation type="unfinished">кг</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="966"/>
+        <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
         <translation type="unfinished">(%s) или (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="473"/>
         <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <translation type="unfinished">%1$s, %3$d %2$s %4$d %5$02d:%6$02d</translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="490"/>
-        <source>%1$s %2$d, %3$d
-%4$02d:%5$02d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="512"/>
-        <source>%1$s %2$d (%3$d dives)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="519"/>
-        <source>%1$s %2$d (1 dive)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">%1$s, %3$d %2$s %4$d %5$02d:%6$02d</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="550"/>
-        <location filename="../planner.c" line="94"/>
-        <location filename="../planner.c" line="748"/>
-        <location filename="../planner.c" line="749"/>
-        <location filename="../statistics.c" line="360"/>
-        <location filename="../statistics.c" line="371"/>
+        <location filename="../divelist.c" line="488"/>
+        <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"/>
         <source>air</source>
         <translation type="unfinished">воздух</translation>
     </message>
@@ -4211,312 +4567,324 @@ Maximum</source>
         <translation type="unfinished">карабины</translation>
     </message>
     <message>
-        <location filename="../file.c" line="106"/>
-        <location filename="../file.c" line="108"/>
-        <location filename="../file.c" line="303"/>
-        <location filename="../file.c" line="305"/>
+        <location filename="../file.c" line="107"/>
+        <location filename="../file.c" line="109"/>
+        <location filename="../file.c" line="308"/>
+        <location filename="../file.c" line="310"/>
+        <location filename="../file.c" line="390"/>
+        <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation type="unfinished">Ошибка чтения &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <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>
+    </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>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
         <translation type="unfinished">отсутствует</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
         <translation type="unfinished">деко стоп</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
         <translation type="unfinished">оставшееся время на дне</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
         <translation type="unfinished">подъем</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
         <translation type="unfinished">потолок</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
         <translation type="unfinished">нагрузка</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
         <translation type="unfinished">передатчик</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
         <translation type="unfinished">нарушение</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
         <translation type="unfinished">закладка</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
         <translation type="unfinished">поверхность</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
         <translation type="unfinished">остановка безопасности</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
         <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
         <translation type="unfinished">замена смеси</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
         <translation type="unfinished">остановка безопасности (добровольно)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
         <translation type="unfinished">остановка безопасности (обязательно)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
         <translation type="unfinished">глубокая остановка</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
         <translation type="unfinished">потолок (остановка безопасности)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
         <translation type="unfinished">время погружения</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
         <translation type="unfinished">макс. глуб.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
         <translation type="unfinished">OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
         <translation type="unfinished">PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
         <translation type="unfinished">оставшееся время по воздуху</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
         <translation type="unfinished">rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
         <translation type="unfinished">направление</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
         <translation type="unfinished">насыщение тканей</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
         <translation type="unfinished">время без остановки</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="157"/>
+        <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
         <translation type="unfinished">неверный номер события</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="390"/>
+        <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
         <translation type="unfinished">Невозможно создать анализатор для %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="396"/>
+        <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
         <translation type="unfinished">Ошибка регистрации данных</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="405"/>
+        <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
         <translation type="unfinished">Ошибка разбора даты/времени</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
         <translation type="unfinished">Погружение %d: %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="427"/>
+        <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
         <translation type="unfinished">Ошибка разбора времени погружения</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="437"/>
+        <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
         <translation type="unfinished">Ошибка разбора макс. глубины</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="447"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
         <translation type="unfinished">Ошибка разбора счетчика смесей</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
         <translation type="unfinished">Ошибка получения солености воды</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="469"/>
+        <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
         <translation type="unfinished">Ошибка разбора смеси</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
         <translation type="unfinished">Ошибка разбора выборки</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="613"/>
+        <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
         <translation type="unfinished">Событие: ожидание действия пользователя</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="621"/>
+        <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation type="unfinished">модель=%u (0x%08x), прошивка=%u (0x%08x), серийный номер=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="663"/>
+        <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
         <translation type="unfinished">Ошибка регистрации обработчика событий.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="668"/>
+        <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished">Ошибка регистрации обработчика завершения.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="672"/>
+        <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
         <translation type="unfinished">Ошибка импорта данных погружения</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="690"/>
+        <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished">Невозможно создать контекст libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished">Невозможно открыть %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="549"/>
+        <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
         <translation type="unfinished">Странное значение процентов %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1695"/>
+        <location filename="../parse-xml.c" line="1717"/>
         <source>Failed to parse &apos;%s&apos;.
 </source>
         <translation type="unfinished">Ошибка разбора &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1696"/>
+        <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation type="unfinished">Ошибка разбора &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1894"/>
+        <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
         <translation type="unfinished">Ошибка запроса get_events в БД.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1929"/>
+        <location filename="../parse-xml.c" line="1951"/>
         <source>Database connection failed &apos;%s&apos;.
 </source>
         <translation type="unfinished">Ошибка соединения с БД &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1936"/>
+        <location filename="../parse-xml.c" line="1958"/>
         <source>Database query failed &apos;%s&apos;.
 </source>
         <translation type="unfinished">Ошибка запроса к БД &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2048"/>
+        <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
         <translation type="unfinished">Невозможно открыть файл преобразования (%s)/%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="96"/>
-        <location filename="../statistics.c" line="363"/>
+        <location filename="../planner.c" line="98"/>
+        <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
         <translation type="unfinished">EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="131"/>
+        <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation type="unfinished">Не найдена смесь %d/%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="192"/>
         <source>Cylinder for planning</source>
-        <translation type="unfinished">Баллон планировщика</translation>
+        <translation type="obsolete">Баллон планировщика</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="217"/>
         <source>Simulated Dive</source>
-        <translation type="unfinished">Моделирование погружения</translation>
+        <translation type="obsolete">Моделирование погружения</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="294"/>
+        <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
         <translation type="unfinished">Слишком много смесей</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="472"/>
+        <location filename="../planner.c" line="493"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -4529,180 +4897,173 @@ based on GFlow = %.0f and GFhigh = %.0f
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="513"/>
+        <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished">Переход на %.*f %s за %d:%02d мин - рантайм %d:%02u на смеси %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="522"/>
+        <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished">Оставаться на %.*f %s в течение %d:%02d мин - рантайм %d:%02u на смеси %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
         <translation type="unfinished">Замена смеси на %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
         <translation type="unfinished">Потребление смеси:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="552"/>
+        <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
         <translation type="unfinished">%.0f%s %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="776"/>
         <source>ean</source>
         <translation type="unfinished">ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1154"/>
         <source>D:%.1f %s</source>
-        <translation type="unfinished">Г:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1158"/>
-        <source>%s
-T:%d:%02d</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Г:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
         <translation type="unfinished">%s
 P:%d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
         <translation type="unfinished">%s
 T:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1177"/>
+        <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation type="unfinished">%s
 Расчетный потолок %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1189"/>
+        <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation type="unfinished">%s
 Ост.безоп:%uмин @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1199"/>
+        <source>@:%d:%02d
+D:%.1f %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1219"/>
+        <source>%s
+SAC:%2.1fl/min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation type="unfinished">%s
 Ост.безоп:неизв. время @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation type="unfinished">%s
 Деко:%uмин @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1211"/>
+        <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation type="unfinished">%s
 Деко:неизв. время @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1217"/>
+        <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
         <translation type="unfinished">%s
 В деко</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
-        <source>%s
-NDL:-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1275"/>
         <source>%s
 NDL:%umin</source>
         <translation type="unfinished">%s
 NDL:%uмин</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
-        <source>%s
-TTS:%umin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1223"/>
         <source>%s
 CNS:%u%%</source>
         <translation type="unfinished">%s
 CNS:%u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1227"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation type="unfinished">%s
 pO%s:%.2fбар</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1231"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation type="unfinished">%s
 pN%s:%.2fбар</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1243"/>
+        <location filename="../profile.c" line="1235"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation type="unfinished">%s
 pHe:%.2fбар</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1240"/>
         <source>%s
 MOD:%d%s</source>
         <translation type="unfinished">%s
 MOD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1247"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -4713,295 +5074,346 @@ END:%d%s
 EADD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1349"/>
+        <location filename="../profile.c" line="1280"/>
+        <source>%s
+Deco:%umin @ %.0f %s (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1289"/>
+        <source>%s
+In deco (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>%s
+NDL:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1296"/>
+        <source>%s
+TTS:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
-        <location filename="../profile.c" line="1357"/>
+        <location filename="../profile.c" line="1409"/>
+        <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1361"/>
+        <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1365"/>
+        <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1369"/>
-        <source>%s%sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1425"/>
+        <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1373"/>
-        <location filename="../profile.c" line="1377"/>
-        <source>%s %sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1429"/>
+        <location filename="../profile.c" line="1433"/>
+        <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1384"/>
+        <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="284"/>
+        <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="288"/>
+        <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../qt-gui.cpp" line="460"/>
+        <source>%1, %2 %3, %4 %5:%6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="473"/>
+        <source>%1 %2, %3
+%4:%5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="486"/>
+        <source>%1 %2 (%3 dives)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="491"/>
+        <source>%1 %2 (1 dive)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>invalid</source>
-        <translation type="unfinished">ошибочное</translation>
+        <translation type="obsolete">ошибочное</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>boat</source>
         <translation type="unfinished">с лодки</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>shore</source>
         <translation type="unfinished">с берега</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>drift</source>
         <translation type="unfinished">течение</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>deep</source>
         <translation type="unfinished">глубокое</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>cavern</source>
         <translation type="unfinished">каверна</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="14"/>
         <source>ice</source>
         <translation type="unfinished">подледное</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>wreck</source>
         <translation type="unfinished">рэк</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>cave</source>
         <translation type="unfinished">пещера</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>altitude</source>
         <translation type="unfinished">высокогорье</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>pool</source>
         <translation type="unfinished">бассейн</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>lake</source>
         <translation type="unfinished">в озере</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="16"/>
         <source>river</source>
         <translation type="unfinished">в реке</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="17"/>
         <source>night</source>
         <translation type="unfinished">ночное</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="17"/>
+        <source>fresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="17"/>
+        <source>student</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>freshwater</source>
-        <translation type="unfinished">в пресной воде</translation>
+        <translation type="obsolete">в пресной воде</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
         <source>training</source>
-        <translation type="unfinished">тренировка</translation>
+        <translation type="obsolete">тренировка</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
         <source>teaching</source>
-        <translation type="unfinished">обучение</translation>
+        <translation type="obsolete">обучение</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
         <source>photo</source>
         <translation type="unfinished">фото</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
         <source>video</source>
         <translation type="unfinished">видео</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
+        <source>instructor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="19"/>
         <source>deco</source>
         <translation type="unfinished">деко стоп</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="199"/>
+        <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
         <translation type="unfinished">более %d дней</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="205"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation type="unfinished">%dд %dч %dмин</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="207"/>
+        <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
         <translation type="unfinished">%dч %dмин</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="218"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation type="unfinished">для погружений №</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="225"/>
+        <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
         <translation type="unfinished">для выбранных погружений</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="260"/>
+        <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
         <translation type="unfinished">для погружения №%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="262"/>
+        <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
         <translation type="unfinished">для выбранного погружения</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="264"/>
+        <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
         <translation type="unfinished">для всех погружений</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="266"/>
+        <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
         <translation type="unfinished">(нет погружений)</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="363"/>
-        <source>, EAN%d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
         <translation type="unfinished">Вск</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
         <translation type="unfinished">Пнд</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
         <translation type="unfinished">Втр</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
         <translation type="unfinished">Срд</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
         <translation type="unfinished">Чтв</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
         <translation type="unfinished">Птн</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
         <translation type="unfinished">Суб</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
         <translation type="unfinished">Янв</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
         <translation type="unfinished">Фев</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
         <translation type="unfinished">Мар</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
         <translation type="unfinished">Апр</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
         <translation type="unfinished">Май</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
         <translation type="unfinished">Июн</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
         <translation type="unfinished">Июл</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
         <translation type="unfinished">Авг</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
         <translation type="unfinished">Снт</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
         <translation type="unfinished">Окт</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
         <translation type="unfinished">Ноя</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
         <translation type="unfinished">Дек</translation>
     </message>
diff --git a/translations/subsurface_sk_SK.ts b/translations/subsurface_sk_SK.ts
index 7f019aa53..2aca2e13f 100644
--- a/translations/subsurface_sk_SK.ts
+++ b/translations/subsurface_sk_SK.ts
@@ -2311,42 +2311,135 @@ tranlators here
     </message>
 </context>
 <context>
+    <name>CSVImportDialog</name>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <source>Import File (CSV)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <source>Field Separator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <source>Field Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <source>Time</source>
+        <translation type="unfinished">Čas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <source>Depth</source>
+        <translation type="unfinished">Hĺbka</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <source>Temp</source>
+        <translation type="unfinished">Teplota</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
+        <source>Po2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <source>Cns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <source>Stopdepth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <source>Pre-configured imports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>Open CSV Log File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>CSV Files (*.csv)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
         <translation type="unfinished">Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
         <translation type="unfinished">Veľkosť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="65"/>
+        <source>Switch at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="163"/>
+        <source>Clicking here will remove this cylinder.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="385"/>
+        <source>Cylinder cannot be removed</source>
+        <translation type="unfinished"></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>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
@@ -2370,30 +2463,35 @@ tranlators here
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Device ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Model</source>
         <translation type="unfinished">Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
         <translation type="unfinished">Voliteľný názov</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <source>Clicking here will remove this divecomputer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1009"/>
+        <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1011"/>
+        <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2401,186 +2499,206 @@ tranlators here
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="39"/>
+        <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="398"/>
+        <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="399"/>
+        <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="400"/>
-        <source>collapse</source>
+        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <source>collapse others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="402"/>
-        <source>remove dive from trip</source>
+        <location filename="../qt-ui/divelistview.cpp" line="638"/>
+        <source>remove dive(s) from trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="405"/>
-        <source>Merge trip with trip above</source>
-        <translation type="unfinished">Spoj akciu s akciou nad</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="639"/>
+        <source>create new trip above</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="406"/>
-        <source>Merge trip with trip below</source>
-        <translation type="unfinished">Spoj akciu s akciou pod</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="640"/>
+        <source>add dive(s) to trip immideately above</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="410"/>
-        <source>delete dive</source>
+        <location filename="../qt-ui/divelistview.cpp" line="643"/>
+        <source>merge trip with trip above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="412"/>
-        <source>merge selected dives</source>
+        <location filename="../qt-ui/divelistview.cpp" line="644"/>
+        <source>merge trip with trip below</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../qt-ui/divelistview.cpp" line="648"/>
+        <source>delete dive(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
-        <source>Bottom SAC</source>
+        <location filename="../qt-ui/divelistview.cpp" line="652"/>
+        <source>save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
-        <source>High GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="653"/>
+        <source>export As UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
-        <source>SAC on DECO Stop</source>
+        <location filename="../qt-ui/divelistview.cpp" line="654"/>
+        <source>shift times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
-        <source>Low GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
+        <source>Save Dives As...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="114"/>
-        <source>Last Stop at 6m</source>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
+        <source>Save File as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="141"/>
-        <source>Start Time</source>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="148"/>
-        <source>ATM Pressure</source>
+        <source>Merge trip with trip above</source>
+        <translation type="obsolete">Spoj akciu s akciou nad</translation>
+    </message>
+    <message>
+        <source>Merge trip with trip below</source>
+        <translation type="obsolete">Spoj akciu s akciou pod</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <source>merge selected dives</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DivePlannerGraphics</name>
+    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="143"/>
-        <source>10m</source>
+        <location filename="../qt-ui/diveplanner.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="145"/>
-        <source>30ft</source>
+        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <source>Bottom SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="146"/>
-        <source>Increase maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <source>SAC on DECO Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="147"/>
-        <source>Decreases maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <source>Increase minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>10min</source>
+        <location filename="../qt-ui/diveplanner.ui" line="108"/>
+        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>Decreases minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <source>Last Stop at 6m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
-        <source>Handler Position Error</source>
+        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="386"/>
-        <source>One or more of your stops will be lost with this operations, 
-Please, remove them first.</source>
+        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <source>ATM Pressure</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DivePlannerGraphics</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <source>10m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="136"/>
+        <source>30ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <source>Handler Position Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="415"/>
-        <source>Air</source>
+        <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>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="420"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="421"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="424"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="425"/>
-        <source>Air</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <source>AIR</source>
+        <translation type="unfinished">Vzduch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="986"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="987"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
         <translation type="unfinished">Dĺžka (min)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="988"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="989"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1141"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1142"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2588,75 +2706,85 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="851"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="937"/>
+        <source>Available Gases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <source>add dive data point</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1051"/>
+        <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
         <translation type="unfinished">#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1052"/>
+        <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
         <translation type="unfinished">Dátum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
         <translation type="unfinished">m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
         <translation type="unfinished">ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1055"/>
+        <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
         <translation type="unfinished">min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
         <translation type="unfinished">US libra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1058"/>
+        <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
         <translation type="unfinished">Oblek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1059"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
         <translation type="unfinished">Fľaša</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1061"/>
+        <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
         <translation type="unfinished">Spotreba plynu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1062"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1063"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
         <translation type="unfinished">max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1064"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
         <translation type="unfinished">Miesto</translation>
     </message>
@@ -2664,14 +2792,20 @@ Please, remove them first.</source>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="138"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
         <translation type="unfinished">Chyba</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="142"/>
-        <source>retry</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
+        <source>Retry</source>
+        <translation type="unfinished">Skús znovu</translation>
     </message>
 </context>
 <context>
@@ -2731,6 +2865,7 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
         <translation type="unfinished">Poznámky</translation>
     </message>
@@ -2745,225 +2880,238 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <source>M/d/yy h:mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="108"/>
-        <location filename="../qt-ui/maintab.cpp" line="307"/>
+        <location filename="../qt-ui/maintab.ui" line="112"/>
+        <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
         <translation type="unfinished">Miesto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="122"/>
+        <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="136"/>
+        <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
         <translation type="unfinished">Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="143"/>
+        <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
         <translation type="unfinished">Partner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="166"/>
+        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
         <translation type="unfinished">Hodnotenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="173"/>
+        <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
         <translation type="unfinished">Viditeľnosť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="182"/>
+        <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
         <translation type="unfinished">Oblek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="206"/>
-        <location filename="../qt-ui/maintab.cpp" line="308"/>
+        <location filename="../qt-ui/maintab.ui" line="217"/>
+        <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
         <translation type="unfinished">Poznámky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="232"/>
+        <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
         <translation type="unfinished">Výstroj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="319"/>
+        <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
         <translation type="unfinished">Informácie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="361"/>
+        <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
         <translation type="unfinished">Dátum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="380"/>
+        <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="399"/>
+        <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="418"/>
+        <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="437"/>
-        <location filename="../qt-ui/maintab.ui" line="692"/>
+        <location filename="../qt-ui/maintab.ui" line="466"/>
+        <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
         <translation type="unfinished">Spotreba plynu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="456"/>
+        <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="475"/>
+        <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="494"/>
+        <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="513"/>
+        <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="532"/>
+        <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="551"/>
+        <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="570"/>
+        <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
         <translation type="unfinished">Čas Ponoru</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="589"/>
+        <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
         <translation type="unfinished">Štatistiky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="668"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation type="unfinished">Hĺbka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="680"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation type="unfinished">Teplota</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="704"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation type="unfinished">Dĺžka (min)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="716"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation type="unfinished">Celkový čas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="735"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation type="unfinished">Ponory</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="68"/>
+        <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
         <translation type="unfinished">Fľaše</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="129"/>
-        <location filename="../qt-ui/maintab.cpp" line="131"/>
-        <source>This trip is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <source>Trip Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="137"/>
-        <location filename="../qt-ui/maintab.cpp" line="139"/>
-        <source>This dive is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="296"/>
+        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <source>Trip Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="286"/>
-        <source>Trip Location</source>
+        <location filename="../qt-ui/maintab.cpp" line="134"/>
+        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="288"/>
-        <source>Trip Notes</source>
+        <location filename="../qt-ui/maintab.cpp" line="143"/>
+        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
-        <location filename="../qt-ui/maintab.cpp" line="337"/>
-        <location filename="../qt-ui/maintab.cpp" line="338"/>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="146"/>
+        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <source>This dive is being edited. Select Save or Cancel when done.</source>
+        <translation type="unfinished"></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"/>
         <source>/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <source>unknown</source>
+        <translation type="unfinished">neznámy</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
         <translation type="unfinished">N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
         <translation type="unfinished">S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
         <translation type="unfinished">E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
         <translation type="unfinished">W</translation>
     </message>
@@ -2976,308 +3124,432 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="177"/>
         <source>File</source>
-        <translation type="unfinished">Súbor</translation>
+        <translation type="obsolete">Súbor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="196"/>
         <source>Log</source>
-        <translation type="unfinished">Log</translation>
+        <translation type="obsolete">Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="211"/>
         <source>View</source>
-        <translation type="unfinished">Náhľad</translation>
+        <translation type="obsolete">Náhľad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="226"/>
+        <location filename="../qt-ui/mainwindow.ui" line="218"/>
         <source>Filter</source>
         <translation type="unfinished">Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="232"/>
         <source>Help</source>
-        <translation type="unfinished">Pomoc</translation>
+        <translation type="obsolete">Pomoc</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="177"/>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="245"/>
+        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <source>&amp;Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <source>&amp;View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <source>&amp;Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>&amp;New logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
         <translation type="unfinished">Nový</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <source>&amp;Open logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="256"/>
+        <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
+        <location filename="../qt-ui/mainwindow.ui" line="281"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation type="unfinished">Uložiť ako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
+        <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="277"/>
+        <location filename="../qt-ui/mainwindow.ui" line="292"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation type="unfinished">Zatvoriť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="285"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="176"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <source>Export UDDF</source>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <source>Export &amp;UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
-        <source>Print</source>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <source>Ctrl+U</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="301"/>
-        <source>Ctrl+P</source>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <source>&amp;Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
-        <source>Preferences</source>
-        <translation type="unfinished">Nastavenia</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <source>Ctrl+,</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="311"/>
-        <source>Quit</source>
-        <translation type="unfinished">Koniec</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
-        <source>Ctrl+Q</source>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <source>Import from &amp;dive computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <source>Download from Dive computer</source>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
-        <source>Ctrl+D</source>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <source>Ctrl+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="327"/>
-        <source>Download from Web Service</source>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <source>&amp;Edit Device Names</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="332"/>
-        <source>Edit Device Names</source>
-        <translation type="unfinished">Edituj názov zariadenia</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <source>Ctrl++</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="337"/>
-        <source>Add Dive</source>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <source>&amp;Renumber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
-        <source>Renumber</source>
-        <translation type="unfinished">Prečíslovanie</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Ctrl+R</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
-        <source>Auto Group</source>
+        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <source>Toggle &amp;Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
-        <source>Toggle Zoom</source>
-        <translation type="unfinished">Zmeň veľkosť</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <source>&amp;Yearly Statistics</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
-        <source>Yearly Statistics</source>
-        <translation type="unfinished">Ročná štatistika</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <source>Ctrl+Y</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
-        <source>View List</source>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Dive List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="365"/>
-        <source>Ctrl+2</source>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <source>Profile</source>
+        <translation type="unfinished">Profil</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <source>Info</source>
+        <translation type="unfinished">Info</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
-        <source>View Profile</source>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <source>User &amp;Manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="373"/>
-        <source>Ctrl+3</source>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <source>Globe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
-        <source>View Info</source>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <source>P&amp;lan Dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="381"/>
-        <source>Ctrl+4</source>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <source>Ctrl+L</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <source>Import CSV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <source>Import CS&amp;V</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <source>Import from Divelogs.de</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <source>Preferences</source>
+        <translation type="unfinished">Nastavenia</translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="obsolete">Koniec</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <source>Ctrl+D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Device Names</source>
+        <translation type="obsolete">Edituj názov zariadenia</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <source>Add Dive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Renumber</source>
+        <translation type="obsolete">Prečíslovanie</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/mainwindow.ui" line="386"/>
-        <source>View All</source>
+        <source>Auto Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="389"/>
+        <source>Toggle Zoom</source>
+        <translation type="obsolete">Zmeň veľkosť</translation>
+    </message>
+    <message>
+        <source>Yearly Statistics</source>
+        <translation type="obsolete">Ročná štatistika</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <source>Ctrl+2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <source>Ctrl+3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <source>Ctrl+4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>Ctrl+1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Prev DC</source>
         <translation type="unfinished">Predchádzajúci DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
+        <location filename="../qt-ui/mainwindow.ui" line="439"/>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="402"/>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Next DC</source>
         <translation type="unfinished">Nasledujúci DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="405"/>
+        <location filename="../qt-ui/mainwindow.ui" line="447"/>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="410"/>
+        <location filename="../qt-ui/mainwindow.ui" line="452"/>
         <source>Select Events</source>
         <translation type="unfinished">Voľba udalosti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
         <source>Input Plan</source>
         <translation type="unfinished">Plánovanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
         <source>About Subsurface</source>
         <translation type="unfinished">O Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>User Manual</source>
-        <translation type="unfinished">Užívateľská príručka</translation>
+        <translation type="obsolete">Užívateľská príručka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>F1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="433"/>
-        <source>View Globe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="478"/>
         <source>Ctrl+5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="441"/>
-        <source>Dive Planner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="108"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Open File</source>
         <translation type="unfinished">Otvoriť súbor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="271"/>
-        <source>manually added dive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="448"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="450"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="455"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
         <translation type="unfinished">Uložiť zmeny?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="456"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="695"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="696"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="144"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="250"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="286"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="197"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3340,215 +3612,235 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="218"/>
+        <location filename="../qt-ui/preferences.ui" line="199"/>
+        <source>Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="205"/>
+        <source>Use Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="225"/>
+        <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="235"/>
+        <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="245"/>
+        <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="269"/>
+        <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
         <translation type="unfinished">Hĺbka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="276"/>
+        <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
         <translation type="unfinished">meter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="286"/>
+        <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
         <translation type="unfinished">stopa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
         <translation type="unfinished">Tlak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="303"/>
+        <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
         <translation type="unfinished">bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="313"/>
+        <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="330"/>
+        <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
         <translation type="unfinished">liter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="340"/>
+        <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
         <translation type="unfinished">kubická stopa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="350"/>
+        <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
         <translation type="unfinished">Teplota</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="357"/>
+        <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
         <translation type="unfinished">Celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
         <translation type="unfinished">Fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="377"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
         <translation type="unfinished">Závažie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
         <translation type="unfinished">US libra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="464"/>
+        <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="472"/>
+        <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="495"/>
-        <location filename="../qt-ui/preferences.ui" line="536"/>
-        <location filename="../qt-ui/preferences.ui" line="577"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="513"/>
+        <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="554"/>
+        <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="595"/>
+        <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="618"/>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="634"/>
+        <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="643"/>
+        <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="666"/>
+        <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="677"/>
+        <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="700"/>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="710"/>
+        <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="721"/>
-        <source>Show time</source>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
+        <source>Calculate NDL/TTS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="733"/>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>Show SAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
+        <source>GFLow at max depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="739"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
-        <source>XML Files (*.xml)</source>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3686,51 +3978,86 @@ Please, remove them first.</source>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="257"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="259"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <source>Hide events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <source>Hide all %1 events?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <source>Remove the selected event?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <source>%1 @ %2:%3</source>
+        <translation type="unfinished"></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>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="337"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="383"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="384"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="582"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="850"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <source>Measure properties of dive segments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
+        <source>Scale your dive to screen size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
+        <source>Edit</source>
+        <translation type="unfinished">Editovať</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
         <translation type="unfinished">vzduch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="584"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="851"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="859"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
         <translation type="unfinished">Záchrana na OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="861"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished">začiatok</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="862"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished">koniec</translation>
@@ -3739,62 +4066,62 @@ Please, remove them first.</source>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1497"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
         <translation type="unfinished">neznámy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1502"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1505"/>
+        <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1512"/>
+        <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1517"/>
+        <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
         <translation type="unfinished">Fľaša</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1519"/>
+        <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
         <translation type="unfinished">Zmes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
         <translation type="unfinished">Použitá zmes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1547"/>
+        <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
         <translation type="unfinished">Spotreba plynu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1549"/>
+        <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
         <translation type="unfinished">Max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1551"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1564"/>
+        <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1570"/>
+        <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3803,30 +4130,30 @@ Please, remove them first.</source>
     <name>QObject</name>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="44"/>
         <source>AIR</source>
         <translation type="unfinished">Vzduch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="38"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="45"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="723"/>
+        <source>Remove this Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>EAN32</source>
-        <translation type="unfinished">EAN32</translation>
+        <translation type="obsolete">EAN32</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="46"/>
         <source>EAN36</source>
-        <translation type="unfinished">EAN36</translation>
+        <translation type="obsolete">EAN36</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="47"/>
-        <source>Choose Gas</source>
+        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <source>No location data - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="188"/>
-        <source>No location data - move the map and double-click to set the dive location</source>
+        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3835,17 +4162,17 @@ Please, remove them first.</source>
         <translation type="unfinished">Zatvoriť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="26"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation type="unfinished">Priemer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="29"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation type="unfinished">Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation type="unfinished">Maximum</translation>
     </message>
@@ -3864,92 +4191,95 @@ Please, remove them first.</source>
     </message>
 </context>
 <context>
-    <name>SubsurfaceAbout</name>
+    <name>ShiftTimesDialog</name>
     <message>
-        <location filename="../qt-ui/about.ui" line="23"/>
-        <source>About Subsurface</source>
-        <translation type="unfinished">O Subsurface</translation>
+        <location filename="../qt-ui/shifttimes.ui" line="14"/>
+        <source>Shift selected times</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
+        <location filename="../qt-ui/shifttimes.ui" line="35"/>
+        <source>Shift times of selected dives by</source>
         <translation type="unfinished"></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>
+        <location filename="../qt-ui/shifttimes.ui" line="80"/>
+        <source>h:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="22"/>
-        <source>&amp;License</source>
+        <location filename="../qt-ui/shifttimes.ui" line="90"/>
+        <source>earlier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
-        <source>&amp;Website</source>
+        <location filename="../qt-ui/shifttimes.ui" line="97"/>
+        <source>later</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SubsurfaceWebServices</name>
+    <name>SubsurfaceAbout</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="14"/>
-        <source>Download Location Data</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/about.ui" line="23"/>
+        <source>About Subsurface</source>
+        <translation type="unfinished">O Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="37"/>
-        <source>Download</source>
+        <location filename="../qt-ui/about.ui" line="64"/>
+        <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="44"/>
-        <source>Enter your ID here</source>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="51"/>
-        <source>User ID</source>
+        <location filename="../qt-ui/about.cpp" line="22"/>
+        <source>&amp;License</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="58"/>
-        <source>Status:</source>
+        <location filename="../qt-ui/about.cpp" line="23"/>
+        <source>&amp;Website</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="49"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
         <translation type="unfinished">Webservis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="90"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="106"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="130"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
         <translation type="unfinished">Chyba spojenia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
         <translation type="unfinished">Neplatný identifikátor užívateľa!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
         <translation type="unfinished">Nemôžem spracovať odpoveď!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="133"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
         <translation type="unfinished">Nahrávanie úspešne ukončené!</translation>
     </message>
@@ -3970,17 +4300,17 @@ Please, remove them first.</source>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Bar</source>
         <translation type="unfinished">bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3988,7 +4318,7 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1393"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3996,96 +4326,139 @@ Please, remove them first.</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>WebServices</name>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="14"/>
+        <source>Download Location Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="20"/>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="27"/>
+        <source>Enter your ID here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="34"/>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="58"/>
+        <source>User ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="72"/>
+        <source>Password</source>
+        <translation type="unfinished">Heslo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="86"/>
+        <source>Upload</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
         <translation type="unfinished">Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
         <translation type="unfinished">Závažie</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="460"/>
+        <source>Clicking here will remove this weigthsystem.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
- &gt; Month</source>
+ &gt; Month / Trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
         <translation type="unfinished">#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1307"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1310"/>
+        <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1311"/>
+        <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1312"/>
-        <location filename="../qt-ui/models.cpp" line="1315"/>
-        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <location filename="../qt-ui/models.cpp" line="1418"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1313"/>
-        <location filename="../qt-ui/models.cpp" line="1316"/>
-        <location filename="../qt-ui/models.cpp" line="1319"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"></translation>
@@ -4094,91 +4467,74 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="44"/>
+        <location filename="../dive.c" line="57"/>
         <source>pascal</source>
         <translation type="unfinished">pascal</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="48"/>
-        <location filename="../qt-gui.cpp" line="323"/>
+        <location filename="../dive.c" line="61"/>
+        <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
         <translation type="unfinished">bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="52"/>
-        <location filename="../qt-gui.cpp" line="326"/>
+        <location filename="../dive.c" line="65"/>
+        <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
         <translation type="unfinished">psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="88"/>
-        <location filename="../qt-gui.cpp" line="304"/>
+        <location filename="../dive.c" line="101"/>
+        <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
         <translation type="unfinished">l</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="93"/>
-        <location filename="../qt-gui.cpp" line="307"/>
+        <location filename="../dive.c" line="106"/>
+        <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
         <translation type="unfinished">cuft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="121"/>
-        <location filename="../qt-gui.cpp" line="207"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
         <translation type="unfinished">m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="126"/>
-        <location filename="../qt-gui.cpp" line="210"/>
+        <location filename="../dive.c" line="139"/>
+        <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
         <translation type="unfinished">ft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="170"/>
-        <location filename="../qt-gui.cpp" line="233"/>
+        <location filename="../dive.c" line="183"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
         <translation type="unfinished">US libra</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
-        <location filename="../qt-gui.cpp" line="231"/>
+        <location filename="../dive.c" line="187"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="966"/>
+        <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
         <translation type="unfinished">(%s) alebo (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="473"/>
         <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <translation type="unfinished">%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="490"/>
-        <source>%1$s %2$d, %3$d
-%4$02d:%5$02d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="512"/>
-        <source>%1$s %2$d (%3$d dives)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="519"/>
-        <source>%1$s %2$d (1 dive)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="550"/>
-        <location filename="../planner.c" line="94"/>
-        <location filename="../planner.c" line="748"/>
-        <location filename="../planner.c" line="749"/>
-        <location filename="../statistics.c" line="360"/>
-        <location filename="../statistics.c" line="371"/>
+        <location filename="../divelist.c" line="488"/>
+        <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"/>
         <source>air</source>
         <translation type="unfinished">vzduch</translation>
     </message>
@@ -4208,312 +4564,324 @@ Maximum</source>
         <translation type="unfinished">clip-on</translation>
     </message>
     <message>
-        <location filename="../file.c" line="106"/>
-        <location filename="../file.c" line="108"/>
-        <location filename="../file.c" line="303"/>
-        <location filename="../file.c" line="305"/>
+        <location filename="../file.c" line="107"/>
+        <location filename="../file.c" line="109"/>
+        <location filename="../file.c" line="308"/>
+        <location filename="../file.c" line="310"/>
+        <location filename="../file.c" line="390"/>
+        <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation type="unfinished">Chyba pri načítaní &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <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>
+    </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>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
         <translation type="unfinished">žiaden</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
         <translation type="unfinished">dekompresná zastávka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
         <translation type="unfinished">rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
         <translation type="unfinished">výstup</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
         <translation type="unfinished">strop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
         <translation type="unfinished">záťaž</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
         <translation type="unfinished">vysielač</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
         <translation type="unfinished">prekročenie</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
         <translation type="unfinished">poznámka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
         <translation type="unfinished">povrch</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
         <translation type="unfinished">bezpečnostná zastávka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
         <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
         <translation type="unfinished">zmena plynu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
         <translation type="unfinished">bezpečnostná zastávka (dobrovoľná)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
         <translation type="unfinished">bezpečnostná zastávka (povinná)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
         <translation type="unfinished">hĺbková zastávka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
         <translation type="unfinished">strop (bezpečnostná zastávka)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
         <translation type="unfinished">čas ponoru</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
         <translation type="unfinished">max. hĺbka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
         <translation type="unfinished">OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
         <translation type="unfinished">PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
         <translation type="unfinished">čas na vzduchu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
         <translation type="unfinished">rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
         <translation type="unfinished">smer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
         <translation type="unfinished">upozornenie nasýtenia tkanív</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
         <translation type="unfinished">non stop čas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="157"/>
+        <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
         <translation type="unfinished">neplatné číslo udalosti</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="390"/>
+        <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
         <translation type="unfinished">Nie je možné spracovať %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="396"/>
+        <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
         <translation type="unfinished">Chyba registrácie dát</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="405"/>
+        <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
         <translation type="unfinished">Chyba spracovania času</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
         <translation type="unfinished">Ponor #%d: %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="427"/>
+        <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
         <translation type="unfinished">Chyba spracovania času ponoru</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="437"/>
+        <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
         <translation type="unfinished">Chyba spracovania maximálnej hĺbky</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="447"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
         <translation type="unfinished">Chyba spracovania dýchacích zmesí</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
         <translation type="unfinished">Chyba získania slanosti vody</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="469"/>
+        <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
         <translation type="unfinished">Chyba spracovania zmesi plynu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
         <translation type="unfinished">Chyba spracovania vzoriek</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="613"/>
+        <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
         <translation type="unfinished">Udalosť: Čakanie na vstup uživateľa</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="621"/>
+        <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation type="unfinished">model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="663"/>
+        <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
         <translation type="unfinished">Chyba registrácia správcu udalosti.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="668"/>
+        <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished">Chyba registrácie správcu ukončenia</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="672"/>
+        <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
         <translation type="unfinished">Chyba importu dát</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="690"/>
+        <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished">Problém inicializácie libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished">Nie je možné otvoriť %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="549"/>
+        <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
         <translation type="unfinished">Zvláštne percenta v %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1695"/>
+        <location filename="../parse-xml.c" line="1717"/>
         <source>Failed to parse &apos;%s&apos;.
 </source>
         <translation type="unfinished">Chyba pri spracovaní &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1696"/>
+        <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation type="unfinished">Chyba pri spracovaní &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1894"/>
+        <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
         <translation type="unfinished">Neúspešná požiadavka: get_events.⏎
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1929"/>
+        <location filename="../parse-xml.c" line="1951"/>
         <source>Database connection failed &apos;%s&apos;.
 </source>
         <translation type="unfinished">Spojenie s databázou zlýhalo &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1936"/>
+        <location filename="../parse-xml.c" line="1958"/>
         <source>Database query failed &apos;%s&apos;.
 </source>
         <translation type="unfinished">Požiadavka na databázu zlyhala &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2048"/>
+        <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
         <translation type="unfinished">Nemôžem otvoriť stylesheet (%s)/%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="96"/>
-        <location filename="../statistics.c" line="363"/>
+        <location filename="../planner.c" line="98"/>
+        <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
         <translation type="unfinished">EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="131"/>
+        <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation type="unfinished">Neviem nájsť zmes %d/%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="192"/>
         <source>Cylinder for planning</source>
-        <translation type="unfinished">Fľaša pre plánovanie</translation>
+        <translation type="obsolete">Fľaša pre plánovanie</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="217"/>
         <source>Simulated Dive</source>
-        <translation type="unfinished">Simulovaný Ponor</translation>
+        <translation type="obsolete">Simulovaný Ponor</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="294"/>
+        <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
         <translation type="unfinished">Príliš veľa zmesí</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="472"/>
+        <location filename="../planner.c" line="493"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -4526,180 +4894,173 @@ zrátaný s  GFlow = %.0f a GFhigh = %.0f
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="513"/>
+        <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished">Prechod na %.*f %s v %d:%02d min - runtime %d:%02u na %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="522"/>
+        <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished">Zostaň v %.*f %s na %d:%02d min - runtime %d:%02u na %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
         <translation type="unfinished">Zmena plynu na %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
         <translation type="unfinished">Spotreba plynu:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="552"/>
+        <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
         <translation type="unfinished">%.0f%s z %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="776"/>
         <source>ean</source>
         <translation type="unfinished">ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1154"/>
         <source>D:%.1f %s</source>
-        <translation type="unfinished">H:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1158"/>
-        <source>%s
-T:%d:%02d</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">H:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
         <translation type="unfinished">%s
 P:%d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
         <translation type="unfinished">%s
 T:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1177"/>
+        <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation type="unfinished">%s
 Vypočítaná hladina %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1189"/>
+        <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation type="unfinished">%s
 Bezpečnostná zastávka:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1199"/>
+        <source>@:%d:%02d
+D:%.1f %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1219"/>
+        <source>%s
+SAC:%2.1fl/min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation type="unfinished">%s
 Bezpečnostná zastávka:nezn. čas @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation type="unfinished">%s
 Deco:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1211"/>
+        <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation type="unfinished">%s
 Deco:nezn. čas @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1217"/>
+        <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
         <translation type="unfinished">%s
 In deco</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
-        <source>%s
-NDL:-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1275"/>
         <source>%s
 NDL:%umin</source>
         <translation type="unfinished">%s
 NDL:%umin</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
-        <source>%s
-TTS:%umin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1223"/>
         <source>%s
 CNS:%u%%</source>
         <translation type="unfinished">%s
 CNS:%u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1227"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation type="unfinished">%s
 pO%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1231"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation type="unfinished">%s
 pN%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1243"/>
+        <location filename="../profile.c" line="1235"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation type="unfinished">%s
 pHe:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1240"/>
         <source>%s
 MOD:%d%s</source>
         <translation type="unfinished">%s
 MOD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1247"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -4710,295 +5071,346 @@ END:%d%s
 EADD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1349"/>
+        <location filename="../profile.c" line="1280"/>
+        <source>%s
+Deco:%umin @ %.0f %s (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1289"/>
+        <source>%s
+In deco (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>%s
+NDL:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1296"/>
+        <source>%s
+TTS:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
-        <location filename="../profile.c" line="1357"/>
+        <location filename="../profile.c" line="1409"/>
+        <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1361"/>
+        <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1365"/>
+        <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1369"/>
-        <source>%s%sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1425"/>
+        <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1373"/>
-        <location filename="../profile.c" line="1377"/>
-        <source>%s %sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1429"/>
+        <location filename="../profile.c" line="1433"/>
+        <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1384"/>
+        <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="284"/>
+        <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="288"/>
+        <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../qt-gui.cpp" line="460"/>
+        <source>%1, %2 %3, %4 %5:%6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="473"/>
+        <source>%1 %2, %3
+%4:%5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="486"/>
+        <source>%1 %2 (%3 dives)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="491"/>
+        <source>%1 %2 (1 dive)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>invalid</source>
-        <translation type="unfinished">neplatný</translation>
+        <translation type="obsolete">neplatný</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>boat</source>
         <translation type="unfinished">z lode</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>shore</source>
         <translation type="unfinished">z brehu</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>drift</source>
         <translation type="unfinished">prúdový</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>deep</source>
         <translation type="unfinished">hlboký</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>cavern</source>
         <translation type="unfinished">dutina</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="14"/>
         <source>ice</source>
         <translation type="unfinished">ľad</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>wreck</source>
         <translation type="unfinished">vrak</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>cave</source>
         <translation type="unfinished">jaskyňa</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>altitude</source>
         <translation type="unfinished">výškovy</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>pool</source>
         <translation type="unfinished">bazén</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>lake</source>
         <translation type="unfinished">jazero</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="16"/>
         <source>river</source>
         <translation type="unfinished">rieka</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="17"/>
         <source>night</source>
         <translation type="unfinished">nočný</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="17"/>
+        <source>fresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="17"/>
+        <source>student</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>freshwater</source>
-        <translation type="unfinished">sladká voda</translation>
+        <translation type="obsolete">sladká voda</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
         <source>training</source>
-        <translation type="unfinished">tréning</translation>
+        <translation type="obsolete">tréning</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
         <source>teaching</source>
-        <translation type="unfinished">výuka</translation>
+        <translation type="obsolete">výuka</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
         <source>photo</source>
         <translation type="unfinished">fotenie</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
         <source>video</source>
         <translation type="unfinished">kamera</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
+        <source>instructor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="19"/>
         <source>deco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="199"/>
+        <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
         <translation type="unfinished">viac než %d dní</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="205"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation type="unfinished">%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="207"/>
+        <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
         <translation type="unfinished">%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="218"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation type="unfinished">pre ponory</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="225"/>
+        <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
         <translation type="unfinished">pre vybrané ponory</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="260"/>
+        <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
         <translation type="unfinished">pre ponor #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="262"/>
+        <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
         <translation type="unfinished">pre vybraný ponor</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="264"/>
+        <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
         <translation type="unfinished">pre všetky ponory</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="266"/>
+        <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
         <translation type="unfinished">(žiadné ponory)</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="363"/>
-        <source>, EAN%d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
         <translation type="unfinished">Ne</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
         <translation type="unfinished">Po</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
         <translation type="unfinished">Ut</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
         <translation type="unfinished">St</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
         <translation type="unfinished">Št</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
         <translation type="unfinished">Pi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
         <translation type="unfinished">So</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
         <translation type="unfinished">Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
         <translation type="unfinished">Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
         <translation type="unfinished">Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
         <translation type="unfinished">Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
         <translation type="unfinished">Máj</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
         <translation type="unfinished">Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
         <translation type="unfinished">Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
         <translation type="unfinished">Aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
         <translation type="unfinished">Sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
         <translation type="unfinished">Okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
         <translation type="unfinished">Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
         <translation type="unfinished">Dec</translation>
     </message>
diff --git a/translations/subsurface_source.ts b/translations/subsurface_source.ts
index f58dc11ea..bdbefddc9 100644
--- a/translations/subsurface_source.ts
+++ b/translations/subsurface_source.ts
@@ -2,42 +2,135 @@
 <!DOCTYPE TS>
 <TS version="2.0">
 <context>
+    <name>CSVImportDialog</name>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <source>Import File (CSV)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <source>Field Separator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <source>Field Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <source>Depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <source>Temp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
+        <source>Po2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <source>Cns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <source>Stopdepth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <source>Pre-configured imports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>Open CSV Log File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>CSV Files (*.csv)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="65"/>
+        <source>Switch at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="163"/>
+        <source>Clicking here will remove this cylinder.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="385"/>
+        <source>Cylinder cannot be removed</source>
+        <translation type="unfinished"></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>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
@@ -61,30 +154,35 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Model</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Device ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <source>Clicking here will remove this divecomputer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1009"/>
+        <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1011"/>
+        <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
         <translation type="unfinished"></translation>
     </message>
@@ -92,186 +190,198 @@
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="39"/>
+        <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="398"/>
+        <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="399"/>
+        <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="400"/>
-        <source>collapse</source>
+        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <source>collapse others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="402"/>
-        <source>remove dive from trip</source>
+        <location filename="../qt-ui/divelistview.cpp" line="638"/>
+        <source>remove dive(s) from trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="405"/>
-        <source>Merge trip with trip above</source>
+        <location filename="../qt-ui/divelistview.cpp" line="639"/>
+        <source>create new trip above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="406"/>
-        <source>Merge trip with trip below</source>
+        <location filename="../qt-ui/divelistview.cpp" line="640"/>
+        <source>add dive(s) to trip immideately above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="410"/>
-        <source>delete dive</source>
+        <location filename="../qt-ui/divelistview.cpp" line="643"/>
+        <source>merge trip with trip above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="412"/>
-        <source>merge selected dives</source>
+        <location filename="../qt-ui/divelistview.cpp" line="644"/>
+        <source>merge trip with trip below</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../qt-ui/divelistview.cpp" line="648"/>
+        <source>delete dive(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
-        <source>Bottom SAC</source>
+        <location filename="../qt-ui/divelistview.cpp" line="652"/>
+        <source>save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
-        <source>High GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="653"/>
+        <source>export As UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
-        <source>SAC on DECO Stop</source>
+        <location filename="../qt-ui/divelistview.cpp" line="654"/>
+        <source>shift times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
-        <source>Low GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
+        <source>Save Dives As...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="114"/>
-        <source>Last Stop at 6m</source>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
+        <source>Save File as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="141"/>
-        <source>Start Time</source>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="148"/>
-        <source>ATM Pressure</source>
+        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <source>merge selected dives</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DivePlannerGraphics</name>
+    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="143"/>
-        <source>10m</source>
+        <location filename="../qt-ui/diveplanner.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="145"/>
-        <source>30ft</source>
+        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <source>Bottom SAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <source>SAC on DECO Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="146"/>
-        <source>Increase maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="147"/>
-        <source>Decreases maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="108"/>
+        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <source>Increase minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <source>Last Stop at 6m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>10min</source>
+        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>Decreases minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <source>ATM Pressure</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DivePlannerGraphics</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
-        <source>Handler Position Error</source>
+        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <source>10m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="386"/>
-        <source>One or more of your stops will be lost with this operations, 
-Please, remove them first.</source>
+        <location filename="../qt-ui/diveplanner.cpp" line="136"/>
+        <source>30ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <source>Handler Position Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="415"/>
-        <source>Air</source>
+        <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>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="420"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="421"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="424"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="425"/>
-        <source>Air</source>
+        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <source>AIR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="986"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="987"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="988"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="989"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1141"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1142"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -279,75 +389,85 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="851"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="937"/>
+        <source>Available Gases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <source>add dive data point</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1051"/>
+        <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1052"/>
+        <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1055"/>
+        <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1058"/>
+        <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1059"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1061"/>
+        <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1062"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1063"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1064"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
@@ -355,13 +475,19 @@ Please, remove them first.</source>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="138"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="142"/>
-        <source>retry</source>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
+        <source>Retry</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -422,6 +548,7 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -436,225 +563,238 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <source>M/d/yy h:mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="108"/>
-        <location filename="../qt-ui/maintab.cpp" line="307"/>
+        <location filename="../qt-ui/maintab.ui" line="112"/>
+        <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="122"/>
+        <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="136"/>
+        <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="143"/>
+        <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="166"/>
+        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="173"/>
+        <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="182"/>
+        <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="206"/>
-        <location filename="../qt-ui/maintab.cpp" line="308"/>
+        <location filename="../qt-ui/maintab.ui" line="217"/>
+        <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="232"/>
+        <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="319"/>
+        <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="361"/>
+        <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="380"/>
+        <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="399"/>
+        <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="418"/>
+        <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="437"/>
-        <location filename="../qt-ui/maintab.ui" line="692"/>
+        <location filename="../qt-ui/maintab.ui" line="466"/>
+        <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="456"/>
+        <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="475"/>
+        <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="494"/>
+        <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="513"/>
+        <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="532"/>
+        <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="551"/>
+        <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="570"/>
+        <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="589"/>
+        <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="668"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="680"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="704"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="716"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="735"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="68"/>
+        <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="129"/>
-        <location filename="../qt-ui/maintab.cpp" line="131"/>
-        <source>This trip is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <source>Trip Location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="296"/>
+        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <source>Trip Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="137"/>
-        <location filename="../qt-ui/maintab.cpp" line="139"/>
-        <source>This dive is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="134"/>
+        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="286"/>
-        <source>Trip Location</source>
+        <location filename="../qt-ui/maintab.cpp" line="143"/>
+        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="288"/>
-        <source>Trip Notes</source>
+        <location filename="../qt-ui/maintab.cpp" line="146"/>
+        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <source>This dive is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
-        <location filename="../qt-ui/maintab.cpp" line="337"/>
-        <location filename="../qt-ui/maintab.cpp" line="338"/>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <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"/>
         <source>/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <source>unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
@@ -667,308 +807,392 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="218"/>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../qt-ui/mainwindow.ui" line="177"/>
-        <source>File</source>
+        <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="196"/>
-        <source>Log</source>
+        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <source>&amp;Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="211"/>
-        <source>View</source>
+        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="226"/>
-        <source>Filter</source>
+        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="232"/>
-        <source>Help</source>
+        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <source>&amp;Import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="245"/>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>&amp;New logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <source>&amp;Open logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="256"/>
+        <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
+        <location filename="../qt-ui/mainwindow.ui" line="281"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
+        <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="277"/>
+        <location filename="../qt-ui/mainwindow.ui" line="292"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="285"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="176"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <source>Export UDDF</source>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <source>Export &amp;UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
-        <source>Print</source>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <source>Ctrl+U</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="301"/>
-        <source>Ctrl+P</source>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <source>&amp;Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
-        <source>Preferences</source>
+        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <source>Ctrl+,</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="311"/>
-        <source>Quit</source>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
-        <source>Ctrl+Q</source>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <source>Import from &amp;dive computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <source>Download from Dive computer</source>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
-        <source>Ctrl+D</source>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <source>Ctrl+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="327"/>
-        <source>Download from Web Service</source>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <source>&amp;Edit Device Names</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="332"/>
-        <source>Edit Device Names</source>
+        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <source>Ctrl++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="337"/>
-        <source>Add Dive</source>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <source>&amp;Renumber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
-        <source>Renumber</source>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Ctrl+R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
-        <source>Auto Group</source>
+        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <source>Toggle &amp;Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
-        <source>Toggle Zoom</source>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <source>&amp;Yearly Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
-        <source>Yearly Statistics</source>
+        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <source>Ctrl+Y</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
-        <source>View List</source>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Dive List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="365"/>
-        <source>Ctrl+2</source>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
-        <source>View Profile</source>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="373"/>
-        <source>Ctrl+3</source>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
-        <source>View Info</source>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <source>User &amp;Manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="381"/>
-        <source>Ctrl+4</source>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <source>Globe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="386"/>
-        <source>View All</source>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <source>P&amp;lan Dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="389"/>
-        <source>Ctrl+1</source>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <source>Ctrl+L</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
-        <source>Prev DC</source>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <source>Import CSV</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
-        <source>Left</source>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <source>Import CS&amp;V</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="402"/>
-        <source>Next DC</source>
+        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <source>Import from Divelogs.de</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="405"/>
-        <source>Right</source>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <source>Ctrl+P</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="410"/>
-        <source>Select Events</source>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
-        <source>Input Plan</source>
+        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
-        <source>About Subsurface</source>
+        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <source>Ctrl+D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="425"/>
-        <source>User Manual</source>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <source>Add Dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
-        <source>F1</source>
+        <location filename="../qt-ui/mainwindow.ui" line="386"/>
+        <source>Auto Group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <source>Ctrl+2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <source>Ctrl+3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <source>Ctrl+4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="433"/>
-        <source>View Globe</source>
+        <location filename="../qt-ui/mainwindow.ui" line="431"/>
+        <source>Ctrl+1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="436"/>
-        <source>Ctrl+5</source>
+        <source>Prev DC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="441"/>
-        <source>Dive Planner</source>
+        <location filename="../qt-ui/mainwindow.ui" line="439"/>
+        <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="108"/>
-        <source>Open File</source>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
+        <source>Next DC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="447"/>
+        <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="271"/>
-        <source>manually added dive</source>
+        <location filename="../qt-ui/mainwindow.ui" line="452"/>
+        <source>Select Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <source>Input Plan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <source>About Subsurface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
+        <source>F1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="478"/>
+        <source>Ctrl+5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
+        <source>Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="448"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="450"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="455"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="456"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="695"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="696"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="144"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="250"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="286"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="197"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1031,215 +1255,235 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="218"/>
+        <location filename="../qt-ui/preferences.ui" line="199"/>
+        <source>Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="205"/>
+        <source>Use Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="225"/>
+        <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="235"/>
+        <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="245"/>
+        <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="269"/>
+        <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="276"/>
+        <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="286"/>
+        <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="303"/>
+        <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="313"/>
+        <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="330"/>
+        <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="340"/>
+        <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="350"/>
+        <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="357"/>
+        <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="377"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="464"/>
+        <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="472"/>
+        <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="495"/>
-        <location filename="../qt-ui/preferences.ui" line="536"/>
-        <location filename="../qt-ui/preferences.ui" line="577"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="513"/>
+        <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="554"/>
+        <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="595"/>
+        <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="618"/>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="634"/>
+        <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="643"/>
+        <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="666"/>
+        <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="677"/>
+        <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="700"/>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="710"/>
+        <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="721"/>
-        <source>Show time</source>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
+        <source>Calculate NDL/TTS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="733"/>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>Show SAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
+        <source>GFLow at max depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="739"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
-        <source>XML Files (*.xml)</source>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1377,51 +1621,86 @@ Please, remove them first.</source>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="257"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="259"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <source>Hide events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <source>Hide all %1 events?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <source>Remove the selected event?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <source>%1 @ %2:%3</source>
+        <translation type="unfinished"></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>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="337"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="383"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="384"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="582"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="850"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <source>Measure properties of dive segments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
+        <source>Scale your dive to screen size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="584"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="851"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="859"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="861"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="862"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished"></translation>
@@ -1430,62 +1709,62 @@ Please, remove them first.</source>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1497"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1502"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1505"/>
+        <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1512"/>
+        <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1517"/>
+        <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1519"/>
+        <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1547"/>
+        <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1549"/>
+        <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1551"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1564"/>
+        <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1570"/>
+        <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1494,30 +1773,22 @@ Please, remove them first.</source>
     <name>QObject</name>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="44"/>
         <source>AIR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="38"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="45"/>
-        <source>EAN32</source>
+        <location filename="../qt-ui/diveplanner.cpp" line="723"/>
+        <source>Remove this Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="46"/>
-        <source>EAN36</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="47"/>
-        <source>Choose Gas</source>
+        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <source>No location data - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="188"/>
-        <source>No location data - move the map and double-click to set the dive location</source>
+        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1526,17 +1797,17 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="26"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="29"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1555,92 +1826,95 @@ Please, remove them first.</source>
     </message>
 </context>
 <context>
-    <name>SubsurfaceAbout</name>
+    <name>ShiftTimesDialog</name>
     <message>
-        <location filename="../qt-ui/about.ui" line="23"/>
-        <source>About Subsurface</source>
+        <location filename="../qt-ui/shifttimes.ui" line="14"/>
+        <source>Shift selected times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
+        <location filename="../qt-ui/shifttimes.ui" line="35"/>
+        <source>Shift times of selected dives by</source>
         <translation type="unfinished"></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>
+        <location filename="../qt-ui/shifttimes.ui" line="80"/>
+        <source>h:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="22"/>
-        <source>&amp;License</source>
+        <location filename="../qt-ui/shifttimes.ui" line="90"/>
+        <source>earlier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
-        <source>&amp;Website</source>
+        <location filename="../qt-ui/shifttimes.ui" line="97"/>
+        <source>later</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SubsurfaceWebServices</name>
+    <name>SubsurfaceAbout</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="14"/>
-        <source>Download Location Data</source>
+        <location filename="../qt-ui/about.ui" line="23"/>
+        <source>About Subsurface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="37"/>
-        <source>Download</source>
+        <location filename="../qt-ui/about.ui" line="64"/>
+        <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="44"/>
-        <source>Enter your ID here</source>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="51"/>
-        <source>User ID</source>
+        <location filename="../qt-ui/about.cpp" line="22"/>
+        <source>&amp;License</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="58"/>
-        <source>Status:</source>
+        <location filename="../qt-ui/about.cpp" line="23"/>
+        <source>&amp;Website</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="49"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="90"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="106"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="130"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="133"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1661,17 +1935,17 @@ Please, remove them first.</source>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Bar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1679,7 +1953,7 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1393"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1687,96 +1961,139 @@ Please, remove them first.</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>WebServices</name>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="14"/>
+        <source>Download Location Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="20"/>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="27"/>
+        <source>Enter your ID here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="34"/>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="58"/>
+        <source>User ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="72"/>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="86"/>
+        <source>Upload</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="460"/>
+        <source>Clicking here will remove this weigthsystem.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
- &gt; Month</source>
+ &gt; Month / Trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1307"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1310"/>
+        <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1311"/>
+        <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1312"/>
-        <location filename="../qt-ui/models.cpp" line="1315"/>
-        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <location filename="../qt-ui/models.cpp" line="1418"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1313"/>
-        <location filename="../qt-ui/models.cpp" line="1316"/>
-        <location filename="../qt-ui/models.cpp" line="1319"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"></translation>
@@ -1785,91 +2102,70 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="44"/>
+        <location filename="../dive.c" line="57"/>
         <source>pascal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="48"/>
-        <location filename="../qt-gui.cpp" line="323"/>
+        <location filename="../dive.c" line="61"/>
+        <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="52"/>
-        <location filename="../qt-gui.cpp" line="326"/>
+        <location filename="../dive.c" line="65"/>
+        <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="88"/>
-        <location filename="../qt-gui.cpp" line="304"/>
+        <location filename="../dive.c" line="101"/>
+        <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="93"/>
-        <location filename="../qt-gui.cpp" line="307"/>
+        <location filename="../dive.c" line="106"/>
+        <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="121"/>
-        <location filename="../qt-gui.cpp" line="207"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="126"/>
-        <location filename="../qt-gui.cpp" line="210"/>
+        <location filename="../dive.c" line="139"/>
+        <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="170"/>
-        <location filename="../qt-gui.cpp" line="233"/>
+        <location filename="../dive.c" line="183"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
-        <location filename="../qt-gui.cpp" line="231"/>
+        <location filename="../dive.c" line="187"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="966"/>
+        <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="473"/>
-        <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="490"/>
-        <source>%1$s %2$d, %3$d
-%4$02d:%5$02d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="512"/>
-        <source>%1$s %2$d (%3$d dives)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="519"/>
-        <source>%1$s %2$d (1 dive)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="550"/>
-        <location filename="../planner.c" line="94"/>
-        <location filename="../planner.c" line="748"/>
-        <location filename="../planner.c" line="749"/>
-        <location filename="../statistics.c" line="360"/>
-        <location filename="../statistics.c" line="371"/>
+        <location filename="../divelist.c" line="488"/>
+        <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"/>
         <source>air</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1899,307 +2195,311 @@ Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../file.c" line="106"/>
-        <location filename="../file.c" line="108"/>
-        <location filename="../file.c" line="303"/>
-        <location filename="../file.c" line="305"/>
+        <location filename="../file.c" line="107"/>
+        <location filename="../file.c" line="109"/>
+        <location filename="../file.c" line="308"/>
+        <location filename="../file.c" line="310"/>
+        <location filename="../file.c" line="390"/>
+        <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <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>
+    </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>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
         <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="157"/>
+        <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="390"/>
+        <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="396"/>
+        <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="405"/>
+        <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="427"/>
+        <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="437"/>
+        <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="447"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="469"/>
+        <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="613"/>
+        <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="621"/>
+        <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="663"/>
+        <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="668"/>
+        <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="672"/>
+        <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="690"/>
+        <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="549"/>
+        <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1695"/>
+        <location filename="../parse-xml.c" line="1717"/>
         <source>Failed to parse &apos;%s&apos;.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1696"/>
+        <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1894"/>
+        <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1929"/>
+        <location filename="../parse-xml.c" line="1951"/>
         <source>Database connection failed &apos;%s&apos;.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1936"/>
+        <location filename="../parse-xml.c" line="1958"/>
         <source>Database query failed &apos;%s&apos;.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2048"/>
+        <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="96"/>
-        <location filename="../statistics.c" line="363"/>
+        <location filename="../planner.c" line="98"/>
+        <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="131"/>
+        <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="192"/>
-        <source>Cylinder for planning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../planner.c" line="217"/>
-        <source>Simulated Dive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../planner.c" line="294"/>
+        <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="472"/>
+        <location filename="../planner.c" line="493"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -2208,457 +2508,481 @@ based on GFlow = %.0f and GFhigh = %.0f
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="513"/>
+        <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="522"/>
+        <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="552"/>
+        <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="776"/>
         <source>ean</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1154"/>
-        <source>D:%.1f %s</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1158"/>
-        <source>%s
-T:%d:%02d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1177"/>
+        <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1189"/>
+        <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1199"/>
+        <source>@:%d:%02d
+D:%.1f %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1219"/>
+        <source>%s
+SAC:%2.1fl/min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1211"/>
+        <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1217"/>
+        <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
+        <location filename="../profile.c" line="1275"/>
         <source>%s
-NDL:-</source>
+NDL:%umin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../profile.c" line="1223"/>
         <source>%s
-NDL:%umin</source>
+CNS:%u%%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../profile.c" line="1227"/>
         <source>%s
-TTS:%umin</source>
+pO%s:%.2fbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../profile.c" line="1231"/>
         <source>%s
-CNS:%u%%</source>
+pN%s:%.2fbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../profile.c" line="1235"/>
         <source>%s
-pO%s:%.2fbar</source>
+pHe:%.2fbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1240"/>
         <source>%s
-pN%s:%.2fbar</source>
+MOD:%d%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1243"/>
+        <location filename="../profile.c" line="1247"/>
         <source>%s
-pHe:%.2fbar</source>
+EAD:%d%s
+END:%d%s
+EADD:%d%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1280"/>
         <source>%s
-MOD:%d%s</source>
+Deco:%umin @ %.0f %s (calc)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1289"/>
         <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
+In deco (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>%s
+NDL:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1296"/>
+        <source>%s
+TTS:%umin (calc)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1349"/>
+        <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
-        <location filename="../profile.c" line="1357"/>
+        <location filename="../profile.c" line="1409"/>
+        <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1361"/>
+        <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1365"/>
+        <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1369"/>
-        <source>%s%sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1425"/>
+        <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1373"/>
-        <location filename="../profile.c" line="1377"/>
-        <source>%s %sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1429"/>
+        <location filename="../profile.c" line="1433"/>
+        <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1384"/>
+        <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="284"/>
+        <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="288"/>
+        <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
-        <source>invalid</source>
+        <location filename="../qt-gui.cpp" line="460"/>
+        <source>%1, %2 %3, %4 %5:%6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../qt-gui.cpp" line="473"/>
+        <source>%1 %2, %3
+%4:%5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="486"/>
+        <source>%1 %2 (%3 dives)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="491"/>
+        <source>%1 %2 (1 dive)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="13"/>
         <source>boat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>shore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>drift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>deep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>cavern</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="14"/>
         <source>ice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>wreck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>cave</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>altitude</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>pool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>lake</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="16"/>
         <source>river</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="17"/>
         <source>night</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
-        <source>freshwater</source>
+        <location filename="../dive.c" line="17"/>
+        <source>fresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
-        <source>training</source>
+        <location filename="../dive.c" line="17"/>
+        <source>student</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
-        <source>teaching</source>
+        <location filename="../dive.c" line="18"/>
+        <source>photo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
-        <source>photo</source>
+        <location filename="../dive.c" line="18"/>
+        <source>video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
-        <source>video</source>
+        <location filename="../dive.c" line="18"/>
+        <source>instructor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="19"/>
         <source>deco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="199"/>
+        <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="205"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="207"/>
+        <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="218"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="225"/>
+        <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="260"/>
+        <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="262"/>
+        <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="264"/>
+        <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="266"/>
+        <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="363"/>
-        <source>, EAN%d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/translations/subsurface_sv_SE.ts b/translations/subsurface_sv_SE.ts
index ab595006a..8c5ba613d 100644
--- a/translations/subsurface_sv_SE.ts
+++ b/translations/subsurface_sv_SE.ts
@@ -2308,42 +2308,135 @@ Fredrik Steen</translation>
     </message>
 </context>
 <context>
+    <name>CSVImportDialog</name>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <source>Import File (CSV)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <source>Field Separator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <source>Field Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <source>Time</source>
+        <translation type="unfinished">Tid</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <source>Depth</source>
+        <translation type="unfinished">Djup</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <source>Temp</source>
+        <translation type="unfinished">Temp</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
+        <source>Po2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <source>Cns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <source>Stopdepth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <source>Pre-configured imports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>Open CSV Log File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <source>CSV Files (*.csv)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Type</source>
         <translation type="unfinished">Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Size</source>
         <translation type="unfinished">Storlek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="62"/>
+        <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="65"/>
+        <source>Switch at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="163"/>
+        <source>Clicking here will remove this cylinder.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="385"/>
+        <source>Cylinder cannot be removed</source>
+        <translation type="unfinished"></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>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
@@ -2367,30 +2460,35 @@ Fredrik Steen</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Device ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Model</source>
         <translation type="unfinished">Modell</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1138"/>
+        <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Nickname</source>
         <translation type="unfinished">Enhetsnamn</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <source>Clicking here will remove this divecomputer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1009"/>
+        <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1011"/>
+        <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2398,186 +2496,206 @@ Fredrik Steen</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="39"/>
+        <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="398"/>
+        <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="399"/>
+        <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="400"/>
-        <source>collapse</source>
+        <location filename="../qt-ui/divelistview.cpp" line="636"/>
+        <source>collapse others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="402"/>
-        <source>remove dive from trip</source>
+        <location filename="../qt-ui/divelistview.cpp" line="638"/>
+        <source>remove dive(s) from trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="405"/>
-        <source>Merge trip with trip above</source>
-        <translation type="unfinished">Sammanfoga resa med tidigare resa</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="639"/>
+        <source>create new trip above</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="406"/>
-        <source>Merge trip with trip below</source>
-        <translation type="unfinished">Sammanfoga resa med senare resa</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="640"/>
+        <source>add dive(s) to trip immideately above</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="410"/>
-        <source>delete dive</source>
+        <location filename="../qt-ui/divelistview.cpp" line="643"/>
+        <source>merge trip with trip above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="412"/>
-        <source>merge selected dives</source>
+        <location filename="../qt-ui/divelistview.cpp" line="644"/>
+        <source>merge trip with trip below</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
+        <location filename="../qt-ui/divelistview.cpp" line="648"/>
+        <source>delete dive(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
-        <source>Bottom SAC</source>
+        <location filename="../qt-ui/divelistview.cpp" line="652"/>
+        <source>save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
-        <source>High GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="653"/>
+        <source>export As UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
-        <source>SAC on DECO Stop</source>
+        <location filename="../qt-ui/divelistview.cpp" line="654"/>
+        <source>shift times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
-        <source>Low GF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
+        <source>Save Dives As...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="114"/>
-        <source>Last Stop at 6m</source>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
+        <source>Save File as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="141"/>
-        <source>Start Time</source>
+        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="148"/>
-        <source>ATM Pressure</source>
+        <source>Merge trip with trip above</source>
+        <translation type="obsolete">Sammanfoga resa med tidigare resa</translation>
+    </message>
+    <message>
+        <source>Merge trip with trip below</source>
+        <translation type="obsolete">Sammanfoga resa med senare resa</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="650"/>
+        <source>merge selected dives</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DivePlannerGraphics</name>
+    <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="143"/>
-        <source>10m</source>
+        <location filename="../qt-ui/diveplanner.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="145"/>
-        <source>30ft</source>
+        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <source>Bottom SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="146"/>
-        <source>Increase maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <source>SAC on DECO Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="147"/>
-        <source>Decreases maximum depth by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <source>Increase minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="148"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>10min</source>
+        <location filename="../qt-ui/diveplanner.ui" line="108"/>
+        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
-        <source>Decreases minimum time by %1</source>
+        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <source>Last Stop at 6m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="385"/>
-        <source>Handler Position Error</source>
+        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="386"/>
-        <source>One or more of your stops will be lost with this operations, 
-Please, remove them first.</source>
+        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <source>ATM Pressure</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DivePlannerGraphics</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+        <source>10m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="136"/>
+        <source>30ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+        <source>Handler Position Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="415"/>
-        <source>Air</source>
+        <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>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="420"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="421"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="424"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="425"/>
-        <source>Air</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <source>AIR</source>
+        <translation type="unfinished">LUFT</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="986"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="987"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
         <translation type="unfinished">Varaktighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="988"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="989"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1141"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1142"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2585,75 +2703,85 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="851"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="937"/>
+        <source>Available Gases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <source>add dive data point</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1051"/>
+        <location filename="../qt-ui/models.cpp" line="1139"/>
         <source>#</source>
         <translation type="unfinished">#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1052"/>
+        <location filename="../qt-ui/models.cpp" line="1140"/>
         <source>Date</source>
         <translation type="unfinished">Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
         <translation type="unfinished">m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1054"/>
+        <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
         <translation type="unfinished">ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1055"/>
+        <location filename="../qt-ui/models.cpp" line="1143"/>
         <source>min</source>
         <translation type="unfinished">Min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1057"/>
+        <location filename="../qt-ui/models.cpp" line="1145"/>
         <source>lbs</source>
         <translation type="unfinished">pund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1058"/>
+        <location filename="../qt-ui/models.cpp" line="1146"/>
         <source>Suit</source>
         <translation type="unfinished">Dräkt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1059"/>
+        <location filename="../qt-ui/models.cpp" line="1147"/>
         <source>Cyl</source>
         <translation type="unfinished">Cyl</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1061"/>
+        <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>SAC</source>
         <translation type="unfinished">SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1062"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1063"/>
+        <location filename="../qt-ui/models.cpp" line="1151"/>
         <source>maxCNS</source>
         <translation type="unfinished">maxCNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1064"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>Location</source>
         <translation type="unfinished">Plats</translation>
     </message>
@@ -2661,14 +2789,20 @@ Please, remove them first.</source>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="138"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
         <source>Error</source>
         <translation type="unfinished">Error</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="142"/>
-        <source>retry</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
+        <source>Retry</source>
+        <translation type="unfinished">Försök igen</translation>
     </message>
 </context>
 <context>
@@ -2728,6 +2862,7 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="21"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Dive Notes</source>
         <translation type="unfinished">Dykanteckningar</translation>
     </message>
@@ -2742,225 +2877,238 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <source>M/d/yy h:mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="108"/>
-        <location filename="../qt-ui/maintab.cpp" line="307"/>
+        <location filename="../qt-ui/maintab.ui" line="112"/>
+        <location filename="../qt-ui/maintab.cpp" line="345"/>
         <source>Location</source>
         <translation type="unfinished">Plats</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="122"/>
+        <location filename="../qt-ui/maintab.ui" line="140"/>
         <source>Coordinates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="136"/>
+        <location filename="../qt-ui/maintab.ui" line="161"/>
         <source>Divemaster</source>
         <translation type="unfinished">Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="143"/>
+        <location filename="../qt-ui/maintab.ui" line="147"/>
         <source>Buddy</source>
         <translation type="unfinished">Parkamrat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="166"/>
+        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="177"/>
         <source>Rating</source>
         <translation type="unfinished">Rankning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="173"/>
+        <location filename="../qt-ui/maintab.ui" line="184"/>
         <source>Visibility</source>
         <translation type="unfinished">Synlighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="182"/>
+        <location filename="../qt-ui/maintab.ui" line="200"/>
         <source>Suit</source>
         <translation type="unfinished">Dräkt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="206"/>
-        <location filename="../qt-ui/maintab.cpp" line="308"/>
+        <location filename="../qt-ui/maintab.ui" line="217"/>
+        <location filename="../qt-ui/maintab.cpp" line="346"/>
         <source>Notes</source>
         <translation type="unfinished">Anteckningar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="232"/>
+        <location filename="../qt-ui/maintab.ui" line="261"/>
         <source>Equipment</source>
         <translation type="unfinished">Utrustning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="319"/>
+        <location filename="../qt-ui/maintab.ui" line="348"/>
         <source>Dive Info</source>
         <translation type="unfinished">Information</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="361"/>
+        <location filename="../qt-ui/maintab.ui" line="390"/>
         <source>Date</source>
         <translation type="unfinished">Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="380"/>
+        <location filename="../qt-ui/maintab.ui" line="409"/>
         <source>Interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="399"/>
+        <location filename="../qt-ui/maintab.ui" line="428"/>
         <source>Gases Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="418"/>
+        <location filename="../qt-ui/maintab.ui" line="447"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="437"/>
-        <location filename="../qt-ui/maintab.ui" line="692"/>
+        <location filename="../qt-ui/maintab.ui" line="466"/>
+        <location filename="../qt-ui/maintab.ui" line="721"/>
         <source>SAC</source>
         <translation type="unfinished">SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="456"/>
+        <location filename="../qt-ui/maintab.ui" line="485"/>
         <source>Max. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="475"/>
+        <location filename="../qt-ui/maintab.ui" line="504"/>
         <source>Ave. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="494"/>
+        <location filename="../qt-ui/maintab.ui" line="523"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="513"/>
+        <location filename="../qt-ui/maintab.ui" line="542"/>
         <source>Air Pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="532"/>
+        <location filename="../qt-ui/maintab.ui" line="561"/>
         <source>Air Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="551"/>
+        <location filename="../qt-ui/maintab.ui" line="580"/>
         <source>Water Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="570"/>
+        <location filename="../qt-ui/maintab.ui" line="599"/>
         <source>Dive Time</source>
         <translation type="unfinished">Dyktid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="589"/>
+        <location filename="../qt-ui/maintab.ui" line="618"/>
         <source>Salinity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="626"/>
+        <location filename="../qt-ui/maintab.ui" line="655"/>
         <source>Stats</source>
         <translation type="unfinished">Statistik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="668"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation type="unfinished">Djup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="680"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation type="unfinished">Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="704"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation type="unfinished">Varaktighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="716"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation type="unfinished">Total tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="735"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation type="unfinished">Dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="68"/>
+        <location filename="../qt-ui/maintab.cpp" line="69"/>
         <source>Cylinders</source>
         <translation type="unfinished">Flaskor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="72"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Weight System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="129"/>
-        <location filename="../qt-ui/maintab.cpp" line="131"/>
-        <source>This trip is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <source>Trip Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="137"/>
-        <location filename="../qt-ui/maintab.cpp" line="139"/>
-        <source>This dive is being edited. Select Save or Undo when ready.</source>
+        <location filename="../qt-ui/maintab.cpp" line="296"/>
+        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <source>Trip Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="286"/>
-        <source>Trip Location</source>
+        <location filename="../qt-ui/maintab.cpp" line="134"/>
+        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="288"/>
-        <source>Trip Notes</source>
+        <location filename="../qt-ui/maintab.cpp" line="143"/>
+        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
-        <location filename="../qt-ui/maintab.cpp" line="337"/>
-        <location filename="../qt-ui/maintab.cpp" line="338"/>
-        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="146"/>
+        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <source>This dive is being edited. Select Save or Cancel when done.</source>
+        <translation type="unfinished"></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"/>
         <source>/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <source>unknown</source>
+        <translation type="unfinished">okänd</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>N</source>
         <translation type="unfinished">N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="731"/>
+        <location filename="../qt-ui/maintab.cpp" line="854"/>
         <source>S</source>
         <translation type="unfinished">S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>E</source>
         <translation type="unfinished">E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="732"/>
+        <location filename="../qt-ui/maintab.cpp" line="855"/>
         <source>W</source>
         <translation type="unfinished">W</translation>
     </message>
@@ -2973,308 +3121,432 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="177"/>
         <source>File</source>
-        <translation type="unfinished">Fil</translation>
+        <translation type="obsolete">Fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="196"/>
         <source>Log</source>
-        <translation type="unfinished">Log</translation>
+        <translation type="obsolete">Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="211"/>
         <source>View</source>
-        <translation type="unfinished">Visa</translation>
+        <translation type="obsolete">Visa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="226"/>
+        <location filename="../qt-ui/mainwindow.ui" line="218"/>
         <source>Filter</source>
         <translation type="unfinished">Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="232"/>
         <source>Help</source>
-        <translation type="unfinished">Hjälp</translation>
+        <translation type="obsolete">Hjälp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="245"/>
+        <location filename="../qt-ui/mainwindow.ui" line="177"/>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <source>&amp;Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <source>&amp;View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <source>&amp;Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <source>&amp;New logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>New</source>
         <translation type="unfinished">Ny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="254"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <source>&amp;Open logbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="256"/>
+        <location filename="../qt-ui/mainwindow.ui" line="265"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="261"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="276"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="269"/>
+        <location filename="../qt-ui/mainwindow.ui" line="281"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation type="unfinished">Spara som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="272"/>
+        <location filename="../qt-ui/mainwindow.ui" line="287"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="277"/>
+        <location filename="../qt-ui/mainwindow.ui" line="292"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation type="unfinished">Stäng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../qt-ui/mainwindow.ui" line="298"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="285"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="176"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="309"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <source>Export UDDF</source>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <source>Export &amp;UDDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
-        <source>Print</source>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <source>Ctrl+U</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="301"/>
-        <source>Ctrl+P</source>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <source>&amp;Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
-        <source>Preferences</source>
-        <translation type="unfinished">Inställningar</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <source>Ctrl+,</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="311"/>
-        <source>Quit</source>
-        <translation type="unfinished">Avsluta</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
-        <source>Ctrl+Q</source>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <source>Import from &amp;dive computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <source>Download from Dive computer</source>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
-        <source>Ctrl+D</source>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <source>Ctrl+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="327"/>
-        <source>Download from Web Service</source>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <source>&amp;Edit Device Names</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="332"/>
-        <source>Edit Device Names</source>
-        <translation type="unfinished">Ändra Enhetsnamn</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <source>Ctrl++</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="337"/>
-        <source>Add Dive</source>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <source>&amp;Renumber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
-        <source>Renumber</source>
-        <translation type="unfinished">Uppdatera numrering</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <source>Ctrl+R</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="347"/>
-        <source>Auto Group</source>
+        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <source>Toggle &amp;Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
-        <source>Toggle Zoom</source>
-        <translation type="unfinished">Zoom av/på</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <source>&amp;Yearly Statistics</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
-        <source>Yearly Statistics</source>
-        <translation type="unfinished">Årsstatistik</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <source>Ctrl+Y</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
-        <source>View List</source>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <source>Dive List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="365"/>
-        <source>Ctrl+2</source>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <source>Profile</source>
+        <translation type="unfinished">Profil</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <source>Info</source>
+        <translation type="unfinished">Info</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
-        <source>View Profile</source>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <source>User &amp;Manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="373"/>
-        <source>Ctrl+3</source>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <source>Globe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
-        <source>View Info</source>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <source>P&amp;lan Dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="381"/>
-        <source>Ctrl+4</source>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <source>Ctrl+L</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <source>Import CSV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <source>Import CS&amp;V</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <source>Import from Divelogs.de</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <source>Preferences</source>
+        <translation type="unfinished">Inställningar</translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="obsolete">Avsluta</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <source>Ctrl+D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Device Names</source>
+        <translation type="obsolete">Ändra Enhetsnamn</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <source>Add Dive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Renumber</source>
+        <translation type="obsolete">Uppdatera numrering</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/mainwindow.ui" line="386"/>
-        <source>View All</source>
+        <source>Auto Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="389"/>
+        <source>Toggle Zoom</source>
+        <translation type="obsolete">Zoom av/på</translation>
+    </message>
+    <message>
+        <source>Yearly Statistics</source>
+        <translation type="obsolete">Årsstatistik</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <source>Ctrl+2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <source>Ctrl+3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <source>Ctrl+4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="431"/>
         <source>Ctrl+1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Prev DC</source>
         <translation type="unfinished">Föregående dykdator</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
+        <location filename="../qt-ui/mainwindow.ui" line="439"/>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="402"/>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Next DC</source>
         <translation type="unfinished">Nästa dykdator</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="405"/>
+        <location filename="../qt-ui/mainwindow.ui" line="447"/>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="410"/>
+        <location filename="../qt-ui/mainwindow.ui" line="452"/>
         <source>Select Events</source>
         <translation type="unfinished">Välj händelser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
         <source>Input Plan</source>
         <translation type="unfinished">Skriv plan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
         <source>About Subsurface</source>
         <translation type="unfinished">Om Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>User Manual</source>
-        <translation type="unfinished">Användarmanual</translation>
+        <translation type="obsolete">Användarmanual</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>F1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="433"/>
-        <source>View Globe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="478"/>
         <source>Ctrl+5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="441"/>
-        <source>Dive Planner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="108"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
         <source>Open File</source>
         <translation type="unfinished">Öppna fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="271"/>
-        <source>manually added dive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="448"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="450"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="455"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
         <translation type="unfinished">Spara ändringar?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="456"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="695"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="696"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="144"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="250"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="286"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="197"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3337,215 +3609,235 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="218"/>
+        <location filename="../qt-ui/preferences.ui" line="199"/>
+        <source>Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="205"/>
+        <source>Use Default Cylinder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="225"/>
+        <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="235"/>
+        <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="245"/>
+        <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="269"/>
+        <location filename="../qt-ui/preferences.ui" line="292"/>
         <source>Depth</source>
         <translation type="unfinished">Djup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="276"/>
+        <location filename="../qt-ui/preferences.ui" line="299"/>
         <source>Meter</source>
         <translation type="unfinished">meter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="286"/>
+        <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
         <translation type="unfinished">fot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
         <translation type="unfinished">Tryck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="303"/>
+        <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
         <translation type="unfinished">bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="313"/>
+        <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="330"/>
+        <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
         <translation type="unfinished">liter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="340"/>
+        <location filename="../qt-ui/preferences.ui" line="363"/>
         <source>CuFt</source>
         <translation type="unfinished">ft^3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="350"/>
+        <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
         <translation type="unfinished">Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="357"/>
+        <location filename="../qt-ui/preferences.ui" line="380"/>
         <source>Celsius</source>
         <translation type="unfinished">Celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
         <translation type="unfinished">Fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="377"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Weight</source>
         <translation type="unfinished">Vikt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>lbs</source>
         <translation type="unfinished">pund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="432"/>
+        <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="464"/>
+        <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="472"/>
+        <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="495"/>
-        <location filename="../qt-ui/preferences.ui" line="536"/>
-        <location filename="../qt-ui/preferences.ui" line="577"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="513"/>
+        <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="554"/>
+        <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="595"/>
+        <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="618"/>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
         <source>max PP02</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="634"/>
+        <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="643"/>
+        <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="666"/>
+        <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="677"/>
+        <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="700"/>
+        <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="710"/>
+        <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="721"/>
-        <source>Show time</source>
+        <location filename="../qt-ui/preferences.ui" line="743"/>
+        <source>Calculate NDL/TTS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="733"/>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>Show SAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
+        <source>GFLow at max depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="739"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="201"/>
-        <source>XML Files (*.xml)</source>
+        <location filename="../qt-ui/preferences.cpp" line="186"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3683,51 +3975,86 @@ Please, remove them first.</source>
 <context>
     <name>ProfileGraphicsView</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="257"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="259"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
+        <source>Hide events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
+        <source>Hide all %1 events?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
+        <source>Remove the selected event?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
+        <source>%1 @ %2:%3</source>
+        <translation type="unfinished"></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>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="337"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="383"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="384"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="582"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="850"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
+        <source>Measure properties of dive segments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
+        <source>Scale your dive to screen size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
+        <source>Edit</source>
+        <translation type="unfinished">Redigera</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
         <source>air</source>
         <translation type="unfinished">luft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="584"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="851"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
         <source>EAN%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="859"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
         <source>Bailing out to OC</source>
         <translation type="unfinished">Bailout till öppet system</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="861"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished">start</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="862"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished">slut</translation>
@@ -3736,62 +4063,62 @@ Please, remove them first.</source>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1497"/>
+        <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
         <translation type="unfinished">okänd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1502"/>
+        <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1505"/>
+        <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1512"/>
+        <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1517"/>
+        <location filename="../qt-ui/models.cpp" line="1635"/>
         <source>Cylinder</source>
         <translation type="unfinished">Flaska</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1519"/>
+        <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Gasmix</source>
         <translation type="unfinished">Gasblandning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1639"/>
         <source>Gas Used</source>
         <translation type="unfinished">Gasanvändning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1547"/>
+        <location filename="../qt-ui/models.cpp" line="1665"/>
         <source>SAC</source>
         <translation type="unfinished">SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1549"/>
+        <location filename="../qt-ui/models.cpp" line="1667"/>
         <source>Max. CNS</source>
         <translation type="unfinished">Max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1551"/>
+        <location filename="../qt-ui/models.cpp" line="1669"/>
         <source>OTU</source>
         <translation type="unfinished">OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1564"/>
+        <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1570"/>
+        <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3800,30 +4127,30 @@ Please, remove them first.</source>
     <name>QObject</name>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="37"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="44"/>
         <source>AIR</source>
         <translation type="unfinished">LUFT</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="38"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="45"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="723"/>
+        <source>Remove this Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>EAN32</source>
-        <translation type="unfinished">EAN32</translation>
+        <translation type="obsolete">EAN32</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="46"/>
         <source>EAN36</source>
-        <translation type="unfinished">EAN36</translation>
+        <translation type="obsolete">EAN36</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="47"/>
-        <source>Choose Gas</source>
+        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <source>No location data - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="188"/>
-        <source>No location data - move the map and double-click to set the dive location</source>
+        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3832,17 +4159,17 @@ Please, remove them first.</source>
         <translation type="unfinished">Stäng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="26"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation type="unfinished">Genomsnitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="29"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation type="unfinished">Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation type="unfinished">Maximum</translation>
     </message>
@@ -3861,92 +4188,95 @@ Please, remove them first.</source>
     </message>
 </context>
 <context>
-    <name>SubsurfaceAbout</name>
+    <name>ShiftTimesDialog</name>
     <message>
-        <location filename="../qt-ui/about.ui" line="23"/>
-        <source>About Subsurface</source>
-        <translation type="unfinished">Om Subsurface</translation>
+        <location filename="../qt-ui/shifttimes.ui" line="14"/>
+        <source>Shift selected times</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
+        <location filename="../qt-ui/shifttimes.ui" line="35"/>
+        <source>Shift times of selected dives by</source>
         <translation type="unfinished"></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>
+        <location filename="../qt-ui/shifttimes.ui" line="80"/>
+        <source>h:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="22"/>
-        <source>&amp;License</source>
+        <location filename="../qt-ui/shifttimes.ui" line="90"/>
+        <source>earlier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="23"/>
-        <source>&amp;Website</source>
+        <location filename="../qt-ui/shifttimes.ui" line="97"/>
+        <source>later</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SubsurfaceWebServices</name>
+    <name>SubsurfaceAbout</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="14"/>
-        <source>Download Location Data</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/about.ui" line="23"/>
+        <source>About Subsurface</source>
+        <translation type="unfinished">Om Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="37"/>
-        <source>Download</source>
+        <location filename="../qt-ui/about.ui" line="64"/>
+        <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="44"/>
-        <source>Enter your ID here</source>
+        <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>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="51"/>
-        <source>User ID</source>
+        <location filename="../qt-ui/about.cpp" line="22"/>
+        <source>&amp;License</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.ui" line="58"/>
-        <source>Status:</source>
+        <location filename="../qt-ui/about.cpp" line="23"/>
+        <source>&amp;Website</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="49"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/>
         <source>Webservice</source>
         <translation type="unfinished">Webbtjänst</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="90"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="106"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="130"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
         <source>Connection Error: </source>
         <translation type="unfinished">Kontaktfel:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
         <source>Invalid user identifier!</source>
         <translation type="unfinished">Ogiltigt användarid!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
         <source>Cannot parse response!</source>
         <translation type="unfinished">Kan inte tolka respons</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="133"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
         <source>Download Success!</source>
         <translation type="unfinished">Nedladdning lyckades!</translation>
     </message>
@@ -3967,17 +4297,17 @@ Please, remove them first.</source>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Bar</source>
         <translation type="unfinished">bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="718"/>
+        <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3985,7 +4315,7 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1393"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3993,96 +4323,139 @@ Please, remove them first.</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="590"/>
+        <location filename="../qt-ui/models.cpp" line="633"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>WebServices</name>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="14"/>
+        <source>Download Location Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="20"/>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="27"/>
+        <source>Enter your ID here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="34"/>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="58"/>
+        <source>User ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="72"/>
+        <source>Password</source>
+        <translation type="unfinished">Lösenord</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/webservices.ui" line="86"/>
+        <source>Upload</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Type</source>
         <translation type="unfinished">Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="357"/>
+        <location filename="../qt-ui/models.cpp" line="400"/>
         <source>Weight</source>
         <translation type="unfinished">Vikt</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="460"/>
+        <source>Clicking here will remove this weigthsystem.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
- &gt; Month</source>
+ &gt; Month / Trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1306"/>
+        <location filename="../qt-ui/models.cpp" line="1412"/>
         <source>#</source>
         <translation type="unfinished">#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1307"/>
+        <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1309"/>
+        <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1310"/>
+        <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1311"/>
+        <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1312"/>
-        <location filename="../qt-ui/models.cpp" line="1315"/>
-        <location filename="../qt-ui/models.cpp" line="1318"/>
+        <location filename="../qt-ui/models.cpp" line="1418"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1313"/>
-        <location filename="../qt-ui/models.cpp" line="1316"/>
-        <location filename="../qt-ui/models.cpp" line="1319"/>
+        <location filename="../qt-ui/models.cpp" line="1419"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"></translation>
@@ -4091,91 +4464,74 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="44"/>
+        <location filename="../dive.c" line="57"/>
         <source>pascal</source>
         <translation type="unfinished">pascal</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="48"/>
-        <location filename="../qt-gui.cpp" line="323"/>
+        <location filename="../dive.c" line="61"/>
+        <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
         <translation type="unfinished">bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="52"/>
-        <location filename="../qt-gui.cpp" line="326"/>
+        <location filename="../dive.c" line="65"/>
+        <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
         <translation type="unfinished">psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="88"/>
-        <location filename="../qt-gui.cpp" line="304"/>
+        <location filename="../dive.c" line="101"/>
+        <location filename="../qt-gui.cpp" line="303"/>
         <source>l</source>
         <translation type="unfinished">l</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="93"/>
-        <location filename="../qt-gui.cpp" line="307"/>
+        <location filename="../dive.c" line="106"/>
+        <location filename="../qt-gui.cpp" line="306"/>
         <source>cuft</source>
         <translation type="unfinished">ft³</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="121"/>
-        <location filename="../qt-gui.cpp" line="207"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
         <translation type="unfinished">m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="126"/>
-        <location filename="../qt-gui.cpp" line="210"/>
+        <location filename="../dive.c" line="139"/>
+        <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
         <translation type="unfinished">ft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="170"/>
-        <location filename="../qt-gui.cpp" line="233"/>
+        <location filename="../dive.c" line="183"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>lbs</source>
         <translation type="unfinished">pund</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
-        <location filename="../qt-gui.cpp" line="231"/>
+        <location filename="../dive.c" line="187"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <source>kg</source>
         <translation type="unfinished">kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="966"/>
+        <location filename="../dive.c" line="1041"/>
         <source>(%s) or (%s)</source>
         <translation type="unfinished">(%s) eller (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="473"/>
         <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source>
-        <translation type="unfinished">%1$s, %3$d %2$s, %4$d %5$02d:%6$02d</translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="490"/>
-        <source>%1$s %2$d, %3$d
-%4$02d:%5$02d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="512"/>
-        <source>%1$s %2$d (%3$d dives)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../divelist.c" line="519"/>
-        <source>%1$s %2$d (1 dive)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">%1$s, %3$d %2$s, %4$d %5$02d:%6$02d</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="550"/>
-        <location filename="../planner.c" line="94"/>
-        <location filename="../planner.c" line="748"/>
-        <location filename="../planner.c" line="749"/>
-        <location filename="../statistics.c" line="360"/>
-        <location filename="../statistics.c" line="371"/>
+        <location filename="../divelist.c" line="488"/>
+        <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"/>
         <source>air</source>
         <translation type="unfinished">luft</translation>
     </message>
@@ -4205,312 +4561,324 @@ Maximum</source>
         <translation type="unfinished">clip-on</translation>
     </message>
     <message>
-        <location filename="../file.c" line="106"/>
-        <location filename="../file.c" line="108"/>
-        <location filename="../file.c" line="303"/>
-        <location filename="../file.c" line="305"/>
+        <location filename="../file.c" line="107"/>
+        <location filename="../file.c" line="109"/>
+        <location filename="../file.c" line="308"/>
+        <location filename="../file.c" line="310"/>
+        <location filename="../file.c" line="390"/>
+        <location filename="../file.c" line="392"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation type="unfinished">Kunde inte öppna &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <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>
+    </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>
+    </message>
+    <message>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>none</source>
         <translation type="unfinished">inget</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>deco stop</source>
         <translation type="unfinished">dekostopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>rbt</source>
         <translation type="unfinished">rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ascent</source>
         <translation type="unfinished">uppstigning</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>ceiling</source>
         <translation type="unfinished">ceiling</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="135"/>
+        <location filename="../libdivecomputer.c" line="138"/>
         <source>workload</source>
         <translation type="unfinished">arbetsbelastning</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
         <translation type="unfinished">sändare</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>violation</source>
         <translation type="unfinished">kränkning</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>bookmark</source>
         <translation type="unfinished">bokmärke</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
         <translation type="unfinished">ytan</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="136"/>
+        <location filename="../libdivecomputer.c" line="139"/>
         <source>safety stop</source>
         <translation type="unfinished">säkerhetsstopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
         <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>gaschange</source>
         <translation type="unfinished">gasbyte</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (voluntary)</source>
         <translation type="unfinished">säkerhetsstopp (frivilligt)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="137"/>
+        <location filename="../libdivecomputer.c" line="140"/>
         <source>safety stop (mandatory)</source>
         <translation type="unfinished">säkerhetsstopp (obligatoriskt)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>deepstop</source>
         <translation type="unfinished">djupstopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>ceiling (safety stop)</source>
         <translation type="unfinished">ceiling (säkerhetsstopp)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>below floor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="138"/>
+        <location filename="../libdivecomputer.c" line="141"/>
         <source>divetime</source>
         <translation type="unfinished">dyktid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>maxdepth</source>
         <translation type="unfinished">Maxdjup</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>OLF</source>
         <translation type="unfinished">OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
         <translation type="unfinished">PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>airtime</source>
         <translation type="unfinished">gastid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>rgbm</source>
         <translation type="unfinished">rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="139"/>
+        <location filename="../libdivecomputer.c" line="142"/>
         <source>heading</source>
         <translation type="unfinished">riktning</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>tissue level warning</source>
         <translation type="unfinished">vävnadsnivå</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="140"/>
+        <location filename="../libdivecomputer.c" line="143"/>
         <source>non stop time</source>
         <translation type="unfinished">non stop tid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="157"/>
+        <location filename="../libdivecomputer.c" line="160"/>
         <source>invalid event number</source>
         <translation type="unfinished">okänt händelsenummer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="390"/>
+        <location filename="../libdivecomputer.c" line="393"/>
         <source>Unable to create parser for %s %s</source>
         <translation type="unfinished">Kan inte skapa parser för %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="396"/>
+        <location filename="../libdivecomputer.c" line="399"/>
         <source>Error registering the data</source>
         <translation type="unfinished">Kunde inte registrera parser-data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="405"/>
+        <location filename="../libdivecomputer.c" line="408"/>
         <source>Error parsing the datetime</source>
         <translation type="unfinished">Kunde inte tolka tid och datum</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Dive %d: %s %d %04d</source>
         <translation type="unfinished">Dyk #%d: %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="427"/>
+        <location filename="../libdivecomputer.c" line="430"/>
         <source>Error parsing the divetime</source>
         <translation type="unfinished">Kunde inte tolka dyktid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="437"/>
+        <location filename="../libdivecomputer.c" line="440"/>
         <source>Error parsing the maxdepth</source>
         <translation type="unfinished">Kunde inte tolka maxdjup</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="447"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Error parsing the gas mix count</source>
         <translation type="unfinished">Kunde inte tolka antal gasblandningar</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="463"/>
         <source>Error obtaining water salinity</source>
         <translation type="unfinished">Kunde inte ladda vattnets salthalt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="469"/>
+        <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error parsing the gas mix</source>
         <translation type="unfinished">Kunde inte tolka gasblandning</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the samples</source>
         <translation type="unfinished">Kunde inte tolka sampel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="613"/>
+        <location filename="../libdivecomputer.c" line="616"/>
         <source>Event: waiting for user action</source>
         <translation type="unfinished">Händelse: väntar på användaren</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="621"/>
+        <location filename="../libdivecomputer.c" line="624"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation type="unfinished">model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="663"/>
+        <location filename="../libdivecomputer.c" line="666"/>
         <source>Error registering the event handler.</source>
         <translation type="unfinished">Kunde inte registrera event-funktion</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="668"/>
+        <location filename="../libdivecomputer.c" line="671"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished">Kunde inte registrera avbrytningsrutin</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="672"/>
+        <location filename="../libdivecomputer.c" line="675"/>
         <source>Dive data import error</source>
         <translation type="unfinished">Lyckades inte importera dykdata</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="690"/>
+        <location filename="../libdivecomputer.c" line="693"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished">Kan inte skapa libdivecomputer context</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="692"/>
+        <location filename="../libdivecomputer.c" line="695"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished">Kunde inte öppna fil %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="549"/>
+        <location filename="../parse-xml.c" line="580"/>
         <source>Strange percentage reading %s
 </source>
         <translation type="unfinished">Konstig procent läsning %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1695"/>
+        <location filename="../parse-xml.c" line="1717"/>
         <source>Failed to parse &apos;%s&apos;.
 </source>
         <translation type="unfinished">Kunde inte läsa &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1696"/>
+        <location filename="../parse-xml.c" line="1718"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation type="unfinished">Kunde inte läsa &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1894"/>
+        <location filename="../parse-xml.c" line="1916"/>
         <source>Database query get_events failed.
 </source>
         <translation type="unfinished">Databasfråga get_events misslyckades.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1929"/>
+        <location filename="../parse-xml.c" line="1951"/>
         <source>Database connection failed &apos;%s&apos;.
 </source>
         <translation type="unfinished">Databasanslutning misslyckades &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1936"/>
+        <location filename="../parse-xml.c" line="1958"/>
         <source>Database query failed &apos;%s&apos;.
 </source>
         <translation type="unfinished">Databasfråga misslyckades &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2048"/>
+        <location filename="../parse-xml.c" line="2069"/>
         <source>Can&apos;t open stylesheet (%s)/%s</source>
         <translation type="unfinished">Kunde inte öppna stilmall (%s)%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="96"/>
-        <location filename="../statistics.c" line="363"/>
+        <location filename="../planner.c" line="98"/>
+        <location filename="../statistics.c" line="385"/>
         <source>EAN%d</source>
         <translation type="unfinished">EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="131"/>
+        <location filename="../planner.c" line="133"/>
         <source>Can&apos;t find gas %d/%d</source>
         <translation type="unfinished">Kan inte hitta gasen %d/%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="192"/>
         <source>Cylinder for planning</source>
-        <translation type="unfinished">Flaska för planering</translation>
+        <translation type="obsolete">Flaska för planering</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="217"/>
         <source>Simulated Dive</source>
-        <translation type="unfinished">Simulerat dyk</translation>
+        <translation type="obsolete">Simulerat dyk</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="294"/>
+        <location filename="../planner.c" line="315"/>
         <source>Too many gas mixes</source>
         <translation type="unfinished">För många gasblandningar</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="472"/>
+        <location filename="../planner.c" line="493"/>
         <source>%s
 Subsurface dive plan
 based on GFlow = %.0f and GFhigh = %.0f
@@ -4523,180 +4891,173 @@ baserad på GFlow = %.0f och GFhigh = %.0f
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="513"/>
+        <location filename="../planner.c" line="534"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished">Dyk till %.*f %s i %d:%02d min - totaltid %d:%02u on %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="522"/>
+        <location filename="../planner.c" line="543"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
 </source>
         <translation type="unfinished">Stanna vid %.*f %s för %d:%02d min - totaltid %d:%02u on %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="554"/>
         <source>Switch gas to %s
 </source>
         <translation type="unfinished">Byt till gas %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="562"/>
         <source>Gas consumption:
 </source>
         <translation type="unfinished">Gasanvändning:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="552"/>
+        <location filename="../planner.c" line="573"/>
         <source>%.0f%s of %s
 </source>
         <translation type="unfinished">%.0f%s av %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="776"/>
         <source>ean</source>
         <translation type="unfinished">ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1154"/>
         <source>D:%.1f %s</source>
-        <translation type="unfinished">D:%.1f %s</translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1158"/>
-        <source>%s
-T:%d:%02d</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">D:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1203"/>
         <source>%s
 P:%d %s</source>
         <translation type="unfinished">%s
 P:%d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1208"/>
         <source>%s
 T:%.1f %s</source>
         <translation type="unfinished">%s
 T:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1177"/>
+        <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1301"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation type="unfinished">%s
 Beräknat tak %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1189"/>
+        <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1255"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation type="unfinished">%s
 Såkerhetsstopp:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1199"/>
+        <source>@:%d:%02d
+D:%.1f %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1219"/>
+        <source>%s
+SAC:%2.1fl/min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1258"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation type="unfinished">%s
 Säkerhetsstopp:okänd tid @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1263"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation type="unfinished">%s
 Deko:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1211"/>
+        <location filename="../profile.c" line="1266"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation type="unfinished">%s
 Deko:okänd tid @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1217"/>
+        <location filename="../profile.c" line="1272"/>
         <source>%s
 In deco</source>
         <translation type="unfinished">%s
 i deko</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
-        <source>%s
-NDL:-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1275"/>
         <source>%s
 NDL:%umin</source>
         <translation type="unfinished">%s
 NDL:%umin</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
-        <source>%s
-TTS:%umin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1223"/>
         <source>%s
 CNS:%u%%</source>
         <translation type="unfinished">%s
 CNS:%u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1227"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation type="unfinished">%s
 pO%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1231"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation type="unfinished">%s
 pN%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1243"/>
+        <location filename="../profile.c" line="1235"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation type="unfinished">%s
 pHe:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1240"/>
         <source>%s
 MOD:%d%s</source>
         <translation type="unfinished">%s
 MOD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1247"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -4707,295 +5068,346 @@ END:%d%s
 EADD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1349"/>
+        <location filename="../profile.c" line="1280"/>
+        <source>%s
+Deco:%umin @ %.0f %s (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1289"/>
+        <source>%s
+In deco (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1292"/>
+        <source>%s
+NDL:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1296"/>
+        <source>%s
+TTS:%umin (calc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
-        <location filename="../profile.c" line="1357"/>
+        <location filename="../profile.c" line="1409"/>
+        <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1361"/>
+        <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1365"/>
+        <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1369"/>
-        <source>%s%sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1425"/>
+        <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1373"/>
-        <location filename="../profile.c" line="1377"/>
-        <source>%s %sV:%.2f%s/s</source>
+        <location filename="../profile.c" line="1429"/>
+        <location filename="../profile.c" line="1433"/>
+        <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1384"/>
+        <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="284"/>
+        <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="288"/>
+        <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../qt-gui.cpp" line="460"/>
+        <source>%1, %2 %3, %4 %5:%6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="473"/>
+        <source>%1 %2, %3
+%4:%5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="486"/>
+        <source>%1 %2 (%3 dives)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-gui.cpp" line="491"/>
+        <source>%1 %2 (1 dive)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>invalid</source>
-        <translation type="unfinished">ogiltig</translation>
+        <translation type="obsolete">ogiltig</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>boat</source>
         <translation type="unfinished">båt</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>shore</source>
         <translation type="unfinished">strand</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="13"/>
         <source>drift</source>
         <translation type="unfinished">ström</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>deep</source>
         <translation type="unfinished">djup</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="21"/>
+        <location filename="../dive.c" line="14"/>
         <source>cavern</source>
         <translation type="unfinished">cavern</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="14"/>
         <source>ice</source>
         <translation type="unfinished">is</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>wreck</source>
         <translation type="unfinished">vrak</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>cave</source>
         <translation type="unfinished">grotta</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="15"/>
         <source>altitude</source>
         <translation type="unfinished">höjd</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>pool</source>
         <translation type="unfinished">pool</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="22"/>
+        <location filename="../dive.c" line="16"/>
         <source>lake</source>
         <translation type="unfinished">sjö</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="16"/>
         <source>river</source>
         <translation type="unfinished">älv</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="17"/>
         <source>night</source>
         <translation type="unfinished">natt</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
+        <location filename="../dive.c" line="17"/>
+        <source>fresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="17"/>
+        <source>student</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>freshwater</source>
-        <translation type="unfinished">sötvatten</translation>
+        <translation type="obsolete">sötvatten</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
         <source>training</source>
-        <translation type="unfinished">utbildning</translation>
+        <translation type="obsolete">utbildning</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="23"/>
         <source>teaching</source>
-        <translation type="unfinished">undervisning</translation>
+        <translation type="obsolete">undervisning</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
         <source>photo</source>
         <translation type="unfinished">foto</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
         <source>video</source>
         <translation type="unfinished">video</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="24"/>
+        <location filename="../dive.c" line="18"/>
+        <source>instructor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dive.c" line="19"/>
         <source>deco</source>
         <translation type="unfinished">deko</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="199"/>
+        <location filename="../statistics.c" line="215"/>
         <source>more than %d days</source>
         <translation type="unfinished">mer än %d dagar</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="205"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation type="unfinished">%dd %dt %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="207"/>
+        <location filename="../statistics.c" line="223"/>
         <source>%dh %dmin</source>
         <translation type="unfinished">%dt %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="218"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation type="unfinished">för dykningar #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="225"/>
+        <location filename="../statistics.c" line="241"/>
         <source>for selected dives</source>
         <translation type="unfinished">för utvalda dyk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="260"/>
+        <location filename="../statistics.c" line="276"/>
         <source>for dive #%d</source>
         <translation type="unfinished">Dyk #%d </translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="262"/>
+        <location filename="../statistics.c" line="278"/>
         <source>for selected dive</source>
         <translation type="unfinished">för valt dyk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="264"/>
+        <location filename="../statistics.c" line="280"/>
         <source>for all dives</source>
         <translation type="unfinished">för alla dyk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="266"/>
+        <location filename="../statistics.c" line="282"/>
         <source>(no dives)</source>
         <translation type="unfinished">(inga dyk)</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="363"/>
-        <source>, EAN%d</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sun</source>
         <translation type="unfinished">sön</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Mon</source>
         <translation type="unfinished">mån</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Tue</source>
         <translation type="unfinished">tis</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Wed</source>
         <translation type="unfinished">ons</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Thu</source>
         <translation type="unfinished">tor</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Fri</source>
         <translation type="unfinished">fre</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="59"/>
+        <location filename="../subsurfacestartup.c" line="61"/>
         <source>Sat</source>
         <translation type="unfinished">lör</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jan</source>
         <translation type="unfinished">jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Feb</source>
         <translation type="unfinished">feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Mar</source>
         <translation type="unfinished">mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Apr</source>
         <translation type="unfinished">apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>May</source>
         <translation type="unfinished">maj</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="68"/>
+        <location filename="../subsurfacestartup.c" line="70"/>
         <source>Jun</source>
         <translation type="unfinished">jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Jul</source>
         <translation type="unfinished">jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Aug</source>
         <translation type="unfinished">aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Sep</source>
         <translation type="unfinished">sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Oct</source>
         <translation type="unfinished">okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Nov</source>
         <translation type="unfinished">nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="69"/>
+        <location filename="../subsurfacestartup.c" line="71"/>
         <source>Dec</source>
         <translation type="unfinished">dec</translation>
     </message>