Translations: force UTF-8 encoding

This seems to fix transifex issues with strings containing ₂ (subscript 2)

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

1 files changed, 1520 insertions, 910 deletions

diff --git a/translations/subsurface_source.ts b/translations/subsurface_source.ts
index 9861233b8..6bd96ab7d 100644
--- a/translations/subsurface_source.ts
+++ b/translations/subsurface_source.ts
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.0">
+<defaultcodec>UTF-8</defaultcodec>
 <context>
     <name>CylindersModel</name>
     <message>
@@ -39,42 +40,42 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="71"/>
+        <location filename="../qt-ui/models.cpp" line="70"/>
         <source>Switch at</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="162"/>
+        <location filename="../qt-ui/models.cpp" line="158"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="353"/>
+        <location filename="../qt-ui/models.cpp" line="358"/>
         <source>Cylinder cannot be removed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="354"/>
+        <location filename="../qt-ui/models.cpp" line="359"/>
         <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="507"/>
         <source>psi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="508"/>
         <source>bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="527"/>
+        <location filename="../qt-ui/models.cpp" line="532"/>
         <source>l</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="528"/>
+        <location filename="../qt-ui/models.cpp" line="533"/>
         <source>cuft</source>
         <translation type="unfinished"></translation>
     </message>
@@ -101,22 +102,22 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Model</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Device ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1461"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Clicking here will remove this divecomputer.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -124,189 +125,325 @@
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="90"/>
-        <source>air</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="92"/>
-        <source>EAN%1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="99"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="96"/>
         <source>Bailing out to OC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="101"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="98"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="102"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="99"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DiveGasPressureItem</name>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="475"/>
-        <source>air</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="476"/>
-        <source>EAN%1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1258"/>
-        <source> l/min</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
-        <source> cuft/min</source>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <source>/min</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="51"/>
+        <location filename="../qt-ui/divelistview.cpp" line="53"/>
         <source>Show Search Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="706"/>
         <source>expand all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="740"/>
+        <location filename="../qt-ui/divelistview.cpp" line="707"/>
         <source>collapse all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="741"/>
+        <location filename="../qt-ui/divelistview.cpp" line="708"/>
         <source>collapse others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="743"/>
+        <location filename="../qt-ui/divelistview.cpp" line="710"/>
         <source>remove dive(s) from trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="744"/>
+        <location filename="../qt-ui/divelistview.cpp" line="711"/>
         <source>create new trip above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <location filename="../qt-ui/divelistview.cpp" line="725"/>
         <source>add dive(s) to trip immediately above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <location filename="../qt-ui/divelistview.cpp" line="727"/>
         <source>add dive(s) to trip immediately below</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="749"/>
+        <location filename="../qt-ui/divelistview.cpp" line="731"/>
         <source>merge trip with trip above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="750"/>
+        <location filename="../qt-ui/divelistview.cpp" line="732"/>
         <source>merge trip with trip below</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="754"/>
+        <location filename="../qt-ui/divelistview.cpp" line="736"/>
         <source>delete dive(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="756"/>
+        <location filename="../qt-ui/divelistview.cpp" line="738"/>
         <source>mark dive(s) invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
-        <source>save As</source>
+        <location filename="../qt-ui/divelistview.cpp" line="744"/>
+        <source>renumber dive(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="763"/>
-        <source>export As UDDF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <source>shift times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="764"/>
-        <source>export As CSV</source>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <source>load images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="765"/>
-        <source>shift times</source>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Open Image Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="766"/>
-        <source>load images</source>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <source>merge selected dives</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DiveLogExportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
+        <source>Export Dive Log Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="24"/>
+        <source>General Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="30"/>
+        <source>Export format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="42"/>
+        <source>Subsurface XML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="61"/>
+        <source>UDDF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="74"/>
+        <source>divelogs.de</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="84"/>
+        <source>CSV</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="94"/>
+        <source>Worldmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="769"/>
-        <source>upload dive(s) to divelogs.de</source>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="107"/>
+        <source>Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="116"/>
+        <source>Selected dives</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="126"/>
+        <source>All dives</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="178"/>
+        <source>HTML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="184"/>
+        <source>General Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="190"/>
+        <source>Subsurface Numbers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="203"/>
+        <source>Selected Dives</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="216"/>
+        <source>Minimum Javascript</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="229"/>
+        <source>All Dives</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="239"/>
+        <source>Export List only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="252"/>
+        <source>Style Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="264"/>
+        <source>Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="274"/>
+        <source>Font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="795"/>
-        <source>Save Dives As...</source>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
+        <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="814"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <source>10</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <source>12</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <source>14</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <source>16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <source>18</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <source>20</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="323"/>
+        <source>Theme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
+        <source>Light</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <source>Sand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="153"/>
         <source>Export UDDF File as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="815"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="154"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="825"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="157"/>
         <source>Export CSV File as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="826"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="158"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Open Image Files</source>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="162"/>
+        <source>Export World Map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="163"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="177"/>
+        <source>HTML files (*.html)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="760"/>
-        <source>merge selected dives</source>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="167"/>
+        <source>Export Subsurface XML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="168"/>
+        <source>XML files (*.xml *.ssrf)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="176"/>
+        <source>Export HTML files as</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -318,138 +455,133 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="36"/>
-        <source>Import CSV Dive Log Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="50"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
         <source>CSV options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="62"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="651"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="490"/>
         <source>Field Separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="86"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="191"/>
         <source>Pre-configured imports</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="114"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="290"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="41"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="277"/>
         <source>Field Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="80"/>
         <source>Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="100"/>
         <source>Stopdepth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="107"/>
         <source>PO2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="187"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="328"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="114"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="351"/>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="121"/>
         <source>Temp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="151"/>
         <source>Cns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="252"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="674"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="207"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="254"/>
         <source>Units</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="265"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="687"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="220"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="261"/>
         <source>Metric</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="270"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="692"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="225"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="266"/>
         <source>Imperial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="248"/>
         <source>Manual dives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="283"/>
         <source>Dive #</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="317"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="385"/>
         <source>Duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="470"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="453"/>
         <source>Gps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="300"/>
         <source>Max depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="334"/>
         <source>Mean depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="368"/>
         <source>Buddy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="402"/>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="436"/>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
@@ -457,104 +589,70 @@
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="71"/>
-        <source>Bottom SAC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="85"/>
-        <source>SAC on DECO Stop</source>
+        <location filename="../qt-ui/diveplanner.ui" line="106"/>
+        <source>Planned Dive Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="78"/>
-        <source>GFHigh</source>
+        <location filename="../qt-ui/diveplanner.ui" line="134"/>
+        <source>Altitude</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="98"/>
-        <source>GFLow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="125"/>
-        <source>Last Stop at 6m</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="174"/>
-        <source>Start Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="181"/>
+        <location filename="../qt-ui/diveplanner.ui" line="141"/>
         <source>ATM Pressure</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DivePlannerGraphics</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="114"/>
-        <source>10m</source>
+        <location filename="../qt-ui/diveplanner.ui" line="148"/>
+        <source>mbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="116"/>
-        <source>30ft</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="363"/>
-        <source>Handler Position Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="364"/>
-        <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="158"/>
+        <source>m</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="445"/>
-        <source>AIR</source>
+        <location filename="../qt-ui/diveplanner.cpp" line="137"/>
+        <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1148"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="586"/>
         <source>Final Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1150"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="588"/>
         <source>Run time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1152"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="590"/>
         <source>Duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1154"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="592"/>
         <source>Used Gas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1156"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="594"/>
         <source>CC Set Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1391"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="887"/>
         <source>Discard the Plan?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1392"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="888"/>
         <source>You are about to discard your plan.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -562,17 +660,17 @@ Please, remove them first.</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="950"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="252"/>
         <source>Dive Planner Points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="256"/>
         <source>Available Gases</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="979"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="279"/>
         <source>add dive data point</source>
         <translation type="unfinished"></translation>
     </message>
@@ -616,104 +714,104 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
-        <source>Pressure  S</source>
+        <source>Pressure S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
-        <source>Pressure I</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <source>pN₂</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
-        <source>Ceiling</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>pHe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
-        <source>SAC</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>pO₂</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
-        <source>PN2</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <source>Pressure I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
-        <source>PHE</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <source>Ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
-        <source>PO2</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <source>SAC</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1286"/>
         <source>#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1298"/>
         <source>min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>lbs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
+        <location filename="../qt-ui/models.cpp" line="1307"/>
         <source>suit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1310"/>
         <source>cyl</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1344"/>
+        <location filename="../qt-ui/models.cpp" line="1325"/>
         <source>location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1316"/>
         <source>SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1338"/>
+        <location filename="../qt-ui/models.cpp" line="1319"/>
         <source>OTU</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1341"/>
+        <location filename="../qt-ui/models.cpp" line="1322"/>
         <source>maxCNS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -721,114 +819,114 @@ Please, remove them first.</source>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="522"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="520"/>
         <source>Invalid response from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="530"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="528"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="576"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="583"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="581"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="112"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="111"/>
         <source>no dives were selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="130"/>
         <source>failed to create zip file for upload: %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="153"/>
         <source>cannot create temporary file: %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="163"/>
         <source>internal error: %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="181"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="179"/>
         <source>internal error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="638"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="834"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="636"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="832"/>
         <source>Done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="669"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="667"/>
         <source>Uploading dive list...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="700"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="698"/>
         <source>Downloading dive list...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="748"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/>
         <source>Downloading %1 dives...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="791"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/>
         <source>Download finished - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
         <source>Corrupted download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="809"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
         <source>The archive could not be opened:
 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Upload failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="849"/>
         <source>Upload successful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="854"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="852"/>
         <source>Login failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="857"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="855"/>
         <source>Cannot parse response</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="868"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Error: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="835"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/>
         <source>Upload finished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -836,54 +934,54 @@ Please, remove them first.</source>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="123"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="149"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="121"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="147"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="165"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="145"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="169"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="143"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="167"/>
         <source>Retry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="254"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="257"/>
         <source>Find Uemis dive computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="322"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="324"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="323"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="325"/>
         <source>Log files (*.log)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="339"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="341"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="351"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="352"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="353"/>
         <source>Dump files (*.bin)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -951,7 +1049,7 @@ Please, remove them first.</source>
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="104"/>
+        <location filename="../qt-ui/globe.cpp" line="120"/>
         <source>Edit Selected Dive Locations</source>
         <translation type="unfinished"></translation>
     </message>
@@ -960,844 +1058,850 @@ Please, remove them first.</source>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="445"/>
+        <location filename="../qt-ui/maintab.cpp" line="416"/>
         <source>Dive Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="120"/>
-        <location filename="../qt-ui/maintab.cpp" line="469"/>
+        <location filename="../qt-ui/maintab.ui" line="134"/>
+        <location filename="../qt-ui/maintab.cpp" line="440"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="148"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Coordinates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="169"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
         <source>Divemaster</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="155"/>
+        <location filename="../qt-ui/maintab.ui" line="148"/>
         <source>Buddy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="63"/>
-        <source>Start time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
-        <location filename="../qt-ui/maintab.cpp" line="236"/>
+        <location filename="../qt-ui/maintab.cpp" line="245"/>
         <source>Air temp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
-        <location filename="../qt-ui/maintab.cpp" line="237"/>
+        <location filename="../qt-ui/maintab.cpp" line="246"/>
         <source>Water temp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="127"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="223"/>
         <source>Rating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="236"/>
         <source>Visibility</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="215"/>
+        <location filename="../qt-ui/maintab.ui" line="127"/>
         <source>Suit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
-        <location filename="../qt-ui/maintab.cpp" line="470"/>
+        <location filename="../qt-ui/maintab.ui" line="88"/>
+        <location filename="../qt-ui/maintab.cpp" line="441"/>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="270"/>
+        <location filename="../qt-ui/maintab.ui" line="311"/>
         <source>Equipment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="350"/>
+        <location filename="../qt-ui/maintab.ui" line="391"/>
         <source>Dive Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="395"/>
+        <location filename="../qt-ui/maintab.ui" line="299"/>
+        <location filename="../qt-ui/maintab.ui" line="436"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="414"/>
+        <location filename="../qt-ui/maintab.ui" line="275"/>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="455"/>
         <source>Interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="433"/>
+        <location filename="../qt-ui/maintab.ui" line="474"/>
         <source>Gases Used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="452"/>
+        <location filename="../qt-ui/maintab.ui" line="493"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="471"/>
-        <location filename="../qt-ui/maintab.ui" line="729"/>
+        <location filename="../qt-ui/maintab.ui" line="512"/>
+        <location filename="../qt-ui/maintab.ui" line="770"/>
         <source>SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="531"/>
         <source>Max. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="509"/>
+        <location filename="../qt-ui/maintab.ui" line="550"/>
         <source>Ave. Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="528"/>
+        <location filename="../qt-ui/maintab.ui" line="569"/>
         <source>OTU</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="547"/>
+        <location filename="../qt-ui/maintab.ui" line="588"/>
         <source>Air Pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="566"/>
+        <location filename="../qt-ui/maintab.ui" line="607"/>
         <source>Air Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="585"/>
+        <location filename="../qt-ui/maintab.ui" line="626"/>
         <source>Water Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="604"/>
+        <location filename="../qt-ui/maintab.ui" line="645"/>
         <source>Dive Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="623"/>
+        <location filename="../qt-ui/maintab.ui" line="664"/>
         <source>Salinity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="660"/>
+        <location filename="../qt-ui/maintab.ui" line="701"/>
         <source>Stats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="746"/>
         <source>Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="784"/>
         <source>Duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Total Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="835"/>
         <source>Dives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
+        <source>Gas Consumption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="919"/>
+        <source>Photos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="89"/>
         <source>Cylinders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="90"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="93"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="83"/>
+        <location filename="../qt-ui/maintab.cpp" line="94"/>
         <source>Add Weight System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="438"/>
+        <location filename="../qt-ui/maintab.cpp" line="409"/>
         <source>Trip Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="416"/>
-        <location filename="../qt-ui/maintab.cpp" line="440"/>
+        <location filename="../qt-ui/maintab.cpp" line="387"/>
+        <location filename="../qt-ui/maintab.cpp" line="411"/>
         <source>Trip Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="42"/>
+        <location filename="../qt-ui/maintab.cpp" line="48"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="46"/>
+        <location filename="../qt-ui/maintab.cpp" line="52"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="233"/>
+        <location filename="../qt-ui/maintab.cpp" line="242"/>
         <source>Air temp [%1]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="234"/>
+        <location filename="../qt-ui/maintab.cpp" line="243"/>
         <source>Water temp [%1]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="259"/>
+        <location filename="../qt-ui/maintab.cpp" line="278"/>
         <source>This trip is being edited.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="265"/>
+        <location filename="../qt-ui/maintab.cpp" line="285"/>
         <source>Multiple dives are being edited.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="267"/>
+        <location filename="../qt-ui/maintab.cpp" line="287"/>
         <source>This dive is being edited.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="492"/>
-        <location filename="../qt-ui/maintab.cpp" line="500"/>
-        <location filename="../qt-ui/maintab.cpp" line="529"/>
-        <location filename="../qt-ui/maintab.cpp" line="530"/>
-        <location filename="../qt-ui/maintab.cpp" line="531"/>
+        <location filename="../qt-ui/maintab.cpp" line="462"/>
+        <location filename="../qt-ui/maintab.cpp" line="470"/>
+        <location filename="../qt-ui/maintab.cpp" line="503"/>
+        <location filename="../qt-ui/maintab.cpp" line="504"/>
+        <location filename="../qt-ui/maintab.cpp" line="505"/>
         <source>/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="494"/>
+        <location filename="../qt-ui/maintab.cpp" line="464"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>N</source>
+        <location filename="../qt-ui/maintab.cpp" line="501"/>
+        <source>Deepest Dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>S</source>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <source>Shallowest Dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>E</source>
+        <location filename="../qt-ui/maintab.cpp" line="794"/>
+        <source>Discard the Changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>W</source>
+        <location filename="../qt-ui/maintab.cpp" line="795"/>
+        <source>You are about to discard your changes.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="622"/>
+        <location filename="../qt-ui/mainwindow.ui" line="695"/>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="571"/>
+        <location filename="../qt-ui/mainwindow.ui" line="646"/>
         <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="594"/>
+        <location filename="../qt-ui/mainwindow.ui" line="567"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="583"/>
+        <source>Print</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="616"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Courier&apos;; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;.Curier New&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
         <source>&amp;Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="606"/>
+        <location filename="../qt-ui/mainwindow.ui" line="679"/>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="628"/>
+        <location filename="../qt-ui/mainwindow.ui" line="701"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="636"/>
+        <location filename="../qt-ui/mainwindow.ui" line="709"/>
         <source>&amp;Import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="652"/>
+        <location filename="../qt-ui/mainwindow.ui" line="725"/>
         <source>&amp;New logbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="655"/>
+        <location filename="../qt-ui/mainwindow.ui" line="728"/>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="658"/>
+        <location filename="../qt-ui/mainwindow.ui" line="731"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="663"/>
+        <location filename="../qt-ui/mainwindow.ui" line="736"/>
         <source>&amp;Open logbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="666"/>
+        <location filename="../qt-ui/mainwindow.ui" line="739"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <location filename="../qt-ui/mainwindow.ui" line="742"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="674"/>
+        <location filename="../qt-ui/mainwindow.ui" line="747"/>
         <source>&amp;Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="677"/>
+        <location filename="../qt-ui/mainwindow.ui" line="750"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="680"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="685"/>
-        <location filename="../qt-ui/mainwindow.ui" line="688"/>
+        <location filename="../qt-ui/mainwindow.ui" line="758"/>
+        <source>Sa&amp;ve as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>Save as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="691"/>
+        <location filename="../qt-ui/mainwindow.ui" line="764"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="696"/>
-        <location filename="../qt-ui/mainwindow.ui" line="699"/>
+        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="702"/>
+        <location filename="../qt-ui/mainwindow.ui" line="775"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="902"/>
-        <source>Ctrl+I</source>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <source>P&amp;references</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="707"/>
-        <source>Export &amp;UDDF</source>
+        <location filename="../qt-ui/mainwindow.ui" line="831"/>
+        <source>&amp;Add Dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="138"/>
-        <source>Enable the pN2 Graph</source>
+        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <source>Auto &amp;Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="164"/>
-        <source>Enable the pHe graph</source>
+        <location filename="../qt-ui/mainwindow.ui" line="863"/>
+        <source>&amp;Dive List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="300"/>
-        <source>Show/hide heart rate</source>
+        <location filename="../qt-ui/mainwindow.ui" line="871"/>
+        <source>&amp;Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
-        <source>Enable EAD, END, and EADD</source>
+        <location filename="../qt-ui/mainwindow.ui" line="879"/>
+        <source>&amp;Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
-        <source>Show NDL / TTS</source>
+        <location filename="../qt-ui/mainwindow.ui" line="887"/>
+        <source>&amp;All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="456"/>
-        <source>Rescale depth axis</source>
+        <location filename="../qt-ui/mainwindow.ui" line="895"/>
+        <source>P&amp;rev DC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="710"/>
-        <source>Ctrl+U</source>
+        <location filename="../qt-ui/mainwindow.ui" line="903"/>
+        <source>&amp;Next DC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="715"/>
-        <source>Export HTML World Map</source>
+        <location filename="../qt-ui/mainwindow.ui" line="911"/>
+        <source>&amp;Select Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="718"/>
-        <source>Ctrl+H</source>
+        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <source>&amp;About Subsurface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="723"/>
-        <source>&amp;Print</source>
+        <location filename="../qt-ui/mainwindow.ui" line="937"/>
+        <source>&amp;Globe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="734"/>
-        <source>Ctrl+,</source>
+        <location filename="../qt-ui/mainwindow.ui" line="953"/>
+        <source>&amp;Import Log Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="742"/>
-        <source>&amp;Quit</source>
+        <location filename="../qt-ui/mainwindow.ui" line="959"/>
+        <source>Ctrl+I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="753"/>
-        <source>Import from &amp;dive computer</source>
+        <location filename="../qt-ui/mainwindow.ui" line="1008"/>
+        <source>&amp;Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
-        <source>Import &amp;GPS data from Subsurface Service</source>
+        <location filename="../qt-ui/mainwindow.ui" line="1011"/>
+        <source>Export Dive Logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="764"/>
-        <source>Ctrl+G</source>
+        <location filename="../qt-ui/mainwindow.ui" line="1014"/>
+        <source>Ctrl+E</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
-        <source>&amp;Edit Device Names</source>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
+        <source>Enable the pN2 Graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
-        <source>Ctrl++</source>
+        <location filename="../qt-ui/mainwindow.ui" line="128"/>
+        <source>Enable the pHe graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="782"/>
-        <source>&amp;Renumber</source>
+        <location filename="../qt-ui/mainwindow.ui" line="290"/>
+        <source>Show/hide heart rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="785"/>
-        <source>Ctrl+R</source>
+        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <source>Enable EAD, END, and EADD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="798"/>
-        <source>&amp;Yearly Statistics</source>
+        <location filename="../qt-ui/mainwindow.ui" line="238"/>
+        <source>Show NDL / TTS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="801"/>
-        <source>Ctrl+Y</source>
+        <location filename="../qt-ui/mainwindow.ui" line="394"/>
+        <source>Rescale depth axis</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <source>&amp;Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="806"/>
-        <source>Dive List</source>
+        <location filename="../qt-ui/mainwindow.ui" line="791"/>
+        <source>Ctrl+,</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="814"/>
-        <source>Profile</source>
+        <location filename="../qt-ui/mainwindow.ui" line="799"/>
+        <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="822"/>
-        <source>Info</source>
+        <location filename="../qt-ui/mainwindow.ui" line="810"/>
+        <source>Import from &amp;dive computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="830"/>
-        <source>All</source>
+        <location filename="../qt-ui/mainwindow.ui" line="818"/>
+        <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="872"/>
-        <source>User &amp;Manual</source>
+        <location filename="../qt-ui/mainwindow.ui" line="821"/>
+        <source>Ctrl+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="880"/>
-        <source>Globe</source>
+        <location filename="../qt-ui/mainwindow.ui" line="826"/>
+        <source>&amp;Edit Device Names</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="888"/>
-        <source>P&amp;lan Dive</source>
+        <location filename="../qt-ui/mainwindow.ui" line="834"/>
+        <source>Ctrl++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="891"/>
-        <source>Ctrl+L</source>
+        <location filename="../qt-ui/mainwindow.ui" line="839"/>
+        <source>&amp;Renumber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="907"/>
-        <source>Import from Divelogs.de</source>
+        <location filename="../qt-ui/mainwindow.ui" line="842"/>
+        <source>Ctrl+R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
-        <source>&amp;Check for Updates</source>
+        <location filename="../qt-ui/mainwindow.ui" line="855"/>
+        <source>&amp;Yearly Statistics</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="858"/>
+        <source>Ctrl+Y</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="929"/>
+        <source>User &amp;Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="945"/>
+        <source>P&amp;lan Dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="951"/>
-        <source>Export CSV</source>
+        <location filename="../qt-ui/mainwindow.ui" line="948"/>
+        <source>Ctrl+L</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="726"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1003"/>
+        <source>&amp;Check for Updates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="783"/>
         <source>Ctrl+P</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="112"/>
+        <location filename="../qt-ui/mainwindow.ui" line="446"/>
         <source>Enable the pO2 Graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="115"/>
-        <location filename="../qt-ui/mainwindow.ui" line="141"/>
-        <location filename="../qt-ui/mainwindow.ui" line="167"/>
-        <location filename="../qt-ui/mainwindow.ui" line="196"/>
-        <location filename="../qt-ui/mainwindow.ui" line="225"/>
-        <location filename="../qt-ui/mainwindow.ui" line="251"/>
-        <location filename="../qt-ui/mainwindow.ui" line="277"/>
-        <location filename="../qt-ui/mainwindow.ui" line="303"/>
-        <location filename="../qt-ui/mainwindow.ui" line="329"/>
-        <location filename="../qt-ui/mainwindow.ui" line="355"/>
-        <location filename="../qt-ui/mainwindow.ui" line="381"/>
-        <location filename="../qt-ui/mainwindow.ui" line="407"/>
-        <location filename="../qt-ui/mainwindow.ui" line="433"/>
-        <location filename="../qt-ui/mainwindow.ui" line="459"/>
+        <location filename="../qt-ui/mainwindow.ui" line="131"/>
+        <location filename="../qt-ui/mainwindow.ui" line="157"/>
+        <location filename="../qt-ui/mainwindow.ui" line="186"/>
+        <location filename="../qt-ui/mainwindow.ui" line="215"/>
+        <location filename="../qt-ui/mainwindow.ui" line="241"/>
+        <location filename="../qt-ui/mainwindow.ui" line="267"/>
+        <location filename="../qt-ui/mainwindow.ui" line="293"/>
+        <location filename="../qt-ui/mainwindow.ui" line="319"/>
+        <location filename="../qt-ui/mainwindow.ui" line="345"/>
+        <location filename="../qt-ui/mainwindow.ui" line="371"/>
+        <location filename="../qt-ui/mainwindow.ui" line="397"/>
+        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="316"/>
         <source>Enable MOD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="193"/>
+        <location filename="../qt-ui/mainwindow.ui" line="183"/>
         <source>Show the DC Reported Ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="222"/>
+        <location filename="../qt-ui/mainwindow.ui" line="212"/>
         <source>Show the Calculated Ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="274"/>
+        <location filename="../qt-ui/mainwindow.ui" line="264"/>
         <source>Show Calculated Ceiling with 3m Increments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="154"/>
         <source>Calculate All Tissues</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <location filename="../qt-ui/mainwindow.ui" line="368"/>
         <source>Show SAC Rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="430"/>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Enable / Disable the Ruler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="731"/>
-        <source>Preferences</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="745"/>
+        <location filename="../qt-ui/mainwindow.ui" line="802"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="756"/>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
         <source>Ctrl+D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="774"/>
-        <source>Add Dive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="793"/>
-        <source>Auto Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="809"/>
+        <location filename="../qt-ui/mainwindow.ui" line="866"/>
         <source>Ctrl+2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="817"/>
+        <location filename="../qt-ui/mainwindow.ui" line="874"/>
         <source>Ctrl+3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <location filename="../qt-ui/mainwindow.ui" line="882"/>
         <source>Ctrl+4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="833"/>
+        <location filename="../qt-ui/mainwindow.ui" line="890"/>
         <source>Ctrl+1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="838"/>
-        <source>Prev DC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="841"/>
+        <location filename="../qt-ui/mainwindow.ui" line="898"/>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="846"/>
-        <source>Next DC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="849"/>
+        <location filename="../qt-ui/mainwindow.ui" line="906"/>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="854"/>
-        <source>Select Events</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <location filename="../qt-ui/mainwindow.ui" line="916"/>
         <source>Input Plan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="864"/>
-        <source>About Subsurface</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="875"/>
+        <location filename="../qt-ui/mainwindow.ui" line="932"/>
         <source>F1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="883"/>
+        <location filename="../qt-ui/mainwindow.ui" line="940"/>
         <source>Ctrl+5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="896"/>
-        <source>Import Log Files</source>
+        <location filename="../qt-ui/mainwindow.ui" line="956"/>
+        <source>Import divelog files from other applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="899"/>
-        <source>Import divelog files from other applications</source>
+        <location filename="../qt-ui/mainwindow.ui" line="964"/>
+        <source>Import &amp;from Divelogs.de</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="915"/>
+        <location filename="../qt-ui/mainwindow.ui" line="972"/>
         <source>&amp;Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="918"/>
+        <location filename="../qt-ui/mainwindow.ui" line="975"/>
         <source>Toggle Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <location filename="../qt-ui/mainwindow.ui" line="978"/>
         <source>F11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="174"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="232"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="357"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="749"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="281"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="330"/>
-        <source>Please save or cancel the current dive edit before trying to plan a dive.</source>
+        <location filename="../qt-ui/mainwindow.cpp" line="388"/>
+        <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="396"/>
-        <source>Please save or cancel the current dive edit before trying to add a dive.</source>
+        <location filename="../qt-ui/mainwindow.cpp" line="419"/>
+        <source>Print runtime table</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="645"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="710"/>
         <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="647"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="712"/>
         <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="652"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="717"/>
         <source>Save Changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="653"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="718"/>
         <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="960"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1075"/>
         <source>Save File as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="171"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="232"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="330"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="357"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="396"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="749"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="249"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="388"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1225"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="171"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="188"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1059"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="280"/>
-        <source>Export UDDF File as</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="281"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="289"/>
-        <source>Export CSV File as</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="290"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="299"/>
-        <source>Export World Map</source>
+        <location filename="../qt-ui/mainwindow.cpp" line="514"/>
+        <source>Yearly Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="300"/>
-        <source>HTML files (*.html)</source>
+        <location filename="../qt-ui/mainwindow.cpp" line="1076"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="449"/>
-        <source>Yearly Statistics</source>
+        <location filename="../qt-ui/mainwindow.cpp" line="1199"/>
+        <source>Open Dive Log File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="961"/>
-        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <location filename="../qt-ui/mainwindow.cpp" line="1200"/>
+        <source>Dive Log Files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML Files (*.xml);;UDDF/UDCF Files(*.uddf *.udcf);;JDiveLog Files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
-        <source>Open Dive Log File</source>
+        <location filename="../qt-ui/mainwindow.cpp" line="1225"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
-        <source>Dive Log Files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML Files (*.xml);;UDDF/UDCF Files(*.uddf *.udcf);;JDiveLog Files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Last stop at 20ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1107"/>
-        <source>Please, first finish the current edition before trying to do another.</source>
+        <location filename="../qt-ui/diveplanner.cpp" line="416"/>
+        <source>Last stop at 6m</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1824,247 +1928,297 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="141"/>
+        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="151"/>
         <source>Lists and Tables</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="167"/>
         <source>Font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="170"/>
+        <location filename="../qt-ui/preferences.ui" line="180"/>
         <source>Dives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="176"/>
+        <location filename="../qt-ui/preferences.ui" line="186"/>
         <source>Default Dive file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="188"/>
+        <location filename="../qt-ui/preferences.ui" line="198"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="197"/>
+        <location filename="../qt-ui/preferences.ui" line="207"/>
         <source>Display Invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="214"/>
+        <location filename="../qt-ui/preferences.ui" line="224"/>
         <source>Default Cylinder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="220"/>
+        <location filename="../qt-ui/preferences.ui" line="230"/>
         <source>Use Default Cylinder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <location filename="../qt-ui/preferences.ui" line="247"/>
         <source>Animations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <location filename="../qt-ui/preferences.ui" line="253"/>
         <source>Speed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="270"/>
+        <location filename="../qt-ui/preferences.ui" line="280"/>
         <source>Subsurface Webservice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="276"/>
+        <location filename="../qt-ui/preferences.ui" line="286"/>
         <source>Default User ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="287"/>
+        <location filename="../qt-ui/preferences.ui" line="296"/>
         <source>Save User ID locally?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <source>Clear all settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="312"/>
+        <source>Reset all settings to their default value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
         <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="348"/>
         <source>Metric</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="333"/>
+        <location filename="../qt-ui/preferences.ui" line="358"/>
         <source>Imperial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="343"/>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
         <source>Personalize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="392"/>
         <source>Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="374"/>
+        <location filename="../qt-ui/preferences.ui" line="399"/>
         <source>meter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="409"/>
         <source>feet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="401"/>
+        <location filename="../qt-ui/preferences.ui" line="426"/>
         <source>bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="411"/>
+        <location filename="../qt-ui/preferences.ui" line="436"/>
         <source>psi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="428"/>
+        <location filename="../qt-ui/preferences.ui" line="453"/>
         <source>liter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="438"/>
+        <location filename="../qt-ui/preferences.ui" line="463"/>
         <source>cu ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="455"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>celsius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="465"/>
+        <location filename="../qt-ui/preferences.ui" line="490"/>
         <source>fahrenheit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="482"/>
+        <location filename="../qt-ui/preferences.ui" line="507"/>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="573"/>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="598"/>
         <source>threshold when showing pO₂</source>
         <translation type="unfinished"></translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="594"/>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="619"/>
         <source>threshold when showing pN₂</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="615"/>
+        <location filename="../qt-ui/preferences.ui" line="640"/>
         <source>threshold when showing pHe</source>
         <translation type="unfinished"></translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="636"/>
-        <source>max ppO₂ when showing MOD</source>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="811"/>
+        <source>Proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="817"/>
+        <source>Proxy type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="830"/>
+        <source>Host</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="856"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="882"/>
+        <source>Requires authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
+        <source>Username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="925"/>
+        <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="657"/>
+        <location filename="../qt-ui/preferences.ui" line="682"/>
         <source>draw dive computer reported ceiling red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="747"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>System Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="767"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="419"/>
         <source>Pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="421"/>
+        <location filename="../qt-ui/preferences.ui" line="446"/>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="448"/>
+        <location filename="../qt-ui/preferences.ui" line="473"/>
         <source>Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="475"/>
+        <location filename="../qt-ui/preferences.ui" line="500"/>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="517"/>
         <source>lbs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="507"/>
+        <location filename="../qt-ui/preferences.ui" line="532"/>
         <source>Time units</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="513"/>
+        <location filename="../qt-ui/preferences.ui" line="538"/>
         <source>Ascent/Descent speed denominator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="520"/>
+        <location filename="../qt-ui/preferences.ui" line="545"/>
         <source>Minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="530"/>
+        <location filename="../qt-ui/preferences.ui" line="555"/>
         <source>Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="562"/>
+        <location filename="../qt-ui/preferences.ui" line="587"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="668"/>
+        <location filename="../qt-ui/preferences.ui" line="661"/>
+        <source>max pO₂ when showing MOD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="693"/>
         <source>Show non-used cylinders in Equipment Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="679"/>
+        <location filename="../qt-ui/preferences.ui" line="704"/>
         <source>show average depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="731"/>
+        <location filename="../qt-ui/preferences.ui" line="756"/>
         <source>GFLow at max depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="691"/>
+        <location filename="../qt-ui/preferences.ui" line="716"/>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2074,35 +2228,65 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="697"/>
+        <location filename="../qt-ui/preferences.ui" line="722"/>
         <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="739"/>
         <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="23"/>
+        <source>No proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="24"/>
+        <source>System proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="25"/>
+        <source>HTTP proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="26"/>
+        <source>SOCKS proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="245"/>
         <source>Restart required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="231"/>
+        <location filename="../qt-ui/preferences.cpp" line="246"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="347"/>
+        <location filename="../qt-ui/preferences.cpp" line="381"/>
         <source>Open Default Log File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="347"/>
+        <location filename="../qt-ui/preferences.cpp" line="381"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="394"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="395"/>
+        <source>If you click OK, all settings of Subsurface are reset to their default values. This will be applied immediately.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PrintDialog</name>
@@ -2243,72 +2427,72 @@ Please, remove them first.</source>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1898"/>
+        <location filename="../qt-ui/models.cpp" line="1878"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1903"/>
+        <location filename="../qt-ui/models.cpp" line="1883"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1906"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1913"/>
+        <location filename="../qt-ui/models.cpp" line="1893"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1918"/>
+        <location filename="../qt-ui/models.cpp" line="1898"/>
         <source>Gas Used:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1920"/>
+        <location filename="../qt-ui/models.cpp" line="1900"/>
         <source>SAC:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1922"/>
+        <location filename="../qt-ui/models.cpp" line="1902"/>
         <source>Max. CNS:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1924"/>
+        <location filename="../qt-ui/models.cpp" line="1904"/>
         <source>Weights:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1929"/>
+        <location filename="../qt-ui/models.cpp" line="1909"/>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1936"/>
+        <location filename="../qt-ui/models.cpp" line="1916"/>
         <source>Divemaster:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1938"/>
+        <location filename="../qt-ui/models.cpp" line="1918"/>
         <source>Buddy:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1940"/>
+        <location filename="../qt-ui/models.cpp" line="1920"/>
         <source>Suit:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1942"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>Viz:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1944"/>
+        <location filename="../qt-ui/models.cpp" line="1924"/>
         <source>Rating:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2316,62 +2500,77 @@ Please, remove them first.</source>
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="692"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="525"/>
+        <source> (#%1 of %2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/>
+        <source>Make first divecomputer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="906"/>
+        <source>Delete this divecomputer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="913"/>
         <source>Add Gas Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="703"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="924"/>
         <source>Add Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="708"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="928"/>
         <source>Remove Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="713"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="933"/>
         <source>Hide similar events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="719"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="939"/>
         <source>Edit name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="733"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="953"/>
         <source>Unhide all events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="746"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="987"/>
         <source>Hide events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="746"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="987"/>
         <source>Hide all %1 events?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="776"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1022"/>
         <source>Remove the selected event?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="777"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1023"/>
         <source>%1 @ %2:%3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="832"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1073"/>
         <source>Edit name of bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="833"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1074"/>
         <source>Custom name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2379,12 +2578,12 @@ Please, remove them first.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="35"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
         <source>AIR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="723"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="210"/>
         <source>Remove this Point</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2394,22 +2593,22 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="34"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="37"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="40"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="240"/>
+        <location filename="../qt-ui/globe.cpp" line="288"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2423,9 +2622,23 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="128"/>
         <source>New starting number</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="126"/>
+        <source>New number</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SearchBar</name>
+    <message>
+        <location filename="../qt-ui/searchbar.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ShiftImageTimesDialog</name>
@@ -2440,42 +2653,47 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="102"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="95"/>
+        <source>h:mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="105"/>
         <source>earlier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="109"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="112"/>
         <source>later</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="145"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="148"/>
         <source>To compute the offset between the clocks of your dive computer and your camera use your camera to take a picture of your dive compuer displaying the current time. Download that image to your computer and press this button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="155"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="158"/>
         <source>Determine camera time offset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="158"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="161"/>
         <source>Select image of divecomputer showing time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="196"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="183"/>
         <source>Which date and time are displayed on the image?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="212"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="224"/>
         <source>Open Image File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="214"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="226"/>
         <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2555,42 +2773,42 @@ Please, remove them first.</source>
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="339"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="337"/>
         <source>Webservice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/>
         <source>Connecting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="421"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="419"/>
         <source>Download finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="435"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="433"/>
         <source>Download error: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/>
         <source>Connection Error: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="448"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="446"/>
         <source>Invalid user identifier!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="451"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/>
         <source>Cannot parse response!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/>
         <source>Download Success!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2606,17 +2824,17 @@ Please, remove them first.</source>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>bar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2624,7 +2842,7 @@ Please, remove them first.</source>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="128"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="129"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2632,42 +2850,42 @@ Please, remove them first.</source>
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="36"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="35"/>
         <source>Check for updates.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="37"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="36"/>
         <source>&lt;h3&gt;Subsurface was unable to check for updates.&lt;/h3&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="41"/>
         <source>&lt;br/&gt;&lt;b&gt;The following error occurred:&lt;/b&gt;&lt;br/&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="43"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
         <source>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Please check your internet connection.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="52"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="51"/>
         <source>You are using the latest version of subsurface.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="54"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="53"/>
         <source>A new version of subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="57"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="56"/>
         <source>&lt;b&gt;A new version of subsurface is available.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="60"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="59"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2675,25 +2893,163 @@ Please, remove them first.</source>
 <context>
     <name>UserManual</name>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="29"/>
+        <location filename="../qt-ui/usermanual.cpp" line="55"/>
         <source>User Manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="37"/>
+        <location filename="../qt-ui/usermanual.cpp" line="69"/>
+        <location filename="../qt-ui/usermanual.cpp" line="75"/>
         <source>Cannot find the Subsurface manual</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>UserSurvey</name>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="47"/>
+        <source>Subsurface User Survey</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="60"/>
+        <source>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="79"/>
+        <source>Recreational DIver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="92"/>
+        <source>Tech Diver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="105"/>
+        <source>Interested in dive planning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="118"/>
+        <source>I am downloading dives from supported dive computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="131"/>
+        <source>I am importing dives from other software / sources</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="144"/>
+        <source>I am manually entering dives</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="167"/>
+        <source>I use the Android companion app to track dive locations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="190"/>
+        <source>Please type suggestions (in English) in the following box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="203"/>
+        <source>The following information about your system will also be submitted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="27"/>
+        <source>
+Operating System: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="30"/>
+        <source>
+CPU Architecture: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="35"/>
+        <source>
+OS CPU Architecture %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="39"/>
+        <source>
+Language: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="73"/>
+        <source>Should we ask you later?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="74"/>
+        <source>Don&apos;t ask me again</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="75"/>
+        <source>Ask Later</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="76"/>
+        <source>Ask again?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <source>Submit User Survey.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <source>&lt;h3&gt;Subsurface was unable to submit the user survey.&lt;/h3&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="101"/>
+        <source>&lt;br/&gt;&lt;b&gt;The following error occurred:&lt;/b&gt;&lt;br/&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="102"/>
+        <source>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Please check your internet connection.&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="111"/>
+        <source>Survey successfully submitted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
+        <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="723"/>
+        <location filename="../qt-ui/models.cpp" line="721"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="723"/>
+        <location filename="../qt-ui/models.cpp" line="721"/>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2741,12 +3097,12 @@ Please, remove them first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="258"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="256"/>
         <source>Operation timed out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="279"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="277"/>
         <source>Transfering data...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2754,37 +3110,37 @@ Please, remove them first.</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="368"/>
+        <location filename="../qt-ui/models.cpp" line="373"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="368"/>
+        <location filename="../qt-ui/models.cpp" line="373"/>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="428"/>
+        <location filename="../qt-ui/models.cpp" line="433"/>
         <source>Clicking here will remove this weigthsystem.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="453"/>
+        <location filename="../qt-ui/models.cpp" line="458"/>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="454"/>
+        <location filename="../qt-ui/models.cpp" line="459"/>
         <source>lbs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="478"/>
+        <location filename="../qt-ui/models.cpp" line="483"/>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="484"/>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2792,70 +3148,70 @@ Please, remove them first.</source>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1656"/>
+        <location filename="../qt-ui/models.cpp" line="1637"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1643"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>
 Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>
 Shortest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>
 Longest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1674"/>
+        <location filename="../qt-ui/models.cpp" line="1655"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1677"/>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
-        <location filename="../qt-ui/models.cpp" line="1695"/>
+        <location filename="../qt-ui/models.cpp" line="1658"/>
+        <location filename="../qt-ui/models.cpp" line="1667"/>
+        <location filename="../qt-ui/models.cpp" line="1676"/>
         <source>
 Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1680"/>
-        <location filename="../qt-ui/models.cpp" line="1689"/>
-        <location filename="../qt-ui/models.cpp" line="1698"/>
+        <location filename="../qt-ui/models.cpp" line="1661"/>
+        <location filename="../qt-ui/models.cpp" line="1670"/>
+        <location filename="../qt-ui/models.cpp" line="1679"/>
         <source>
 Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1683"/>
+        <location filename="../qt-ui/models.cpp" line="1664"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1692"/>
+        <location filename="../qt-ui/models.cpp" line="1673"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"></translation>
@@ -2864,99 +3220,92 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="58"/>
+        <location filename="../dive.c" line="87"/>
         <source>pascal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="63"/>
-        <location filename="../qt-gui.cpp" line="313"/>
+        <location filename="../dive.c" line="92"/>
+        <location filename="../qt-gui.cpp" line="323"/>
         <source>bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="67"/>
-        <location filename="../qt-gui.cpp" line="316"/>
+        <location filename="../dive.c" line="96"/>
+        <location filename="../qt-gui.cpp" line="326"/>
         <source>psi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="104"/>
-        <location filename="../qt-gui.cpp" line="292"/>
-        <source>l</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../dive.c" line="109"/>
-        <location filename="../qt-gui.cpp" line="297"/>
+        <location filename="../dive.c" line="138"/>
         <source>cuft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="138"/>
-        <location filename="../qt-gui.cpp" line="197"/>
-        <location filename="../qt-gui.cpp" line="212"/>
+        <location filename="../dive.c" line="167"/>
+        <location filename="../qt-gui.cpp" line="205"/>
+        <location filename="../qt-gui.cpp" line="220"/>
+        <location filename="../worldmap-save.c" line="44"/>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="143"/>
-        <location filename="../qt-gui.cpp" line="200"/>
-        <location filename="../qt-gui.cpp" line="214"/>
+        <location filename="../dive.c" line="172"/>
+        <location filename="../qt-gui.cpp" line="208"/>
+        <location filename="../qt-gui.cpp" line="222"/>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="188"/>
-        <location filename="../qt-gui.cpp" line="223"/>
-        <location filename="../qt-gui.cpp" line="233"/>
+        <location filename="../dive.c" line="217"/>
+        <location filename="../qt-gui.cpp" line="231"/>
+        <location filename="../qt-gui.cpp" line="241"/>
         <source>lbs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="192"/>
-        <location filename="../qt-gui.cpp" line="221"/>
-        <location filename="../qt-gui.cpp" line="231"/>
+        <location filename="../dive.c" line="221"/>
+        <location filename="../qt-gui.cpp" line="229"/>
+        <location filename="../qt-gui.cpp" line="239"/>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1120"/>
+        <location filename="../dive.c" line="1237"/>
         <source>(%s) or (%s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="494"/>
-        <location filename="../planner.c" line="98"/>
-        <location filename="../planner.c" line="806"/>
-        <location filename="../planner.c" line="809"/>
-        <location filename="../statistics.c" line="358"/>
-        <location filename="../statistics.c" line="368"/>
+        <location filename="../divelist.c" line="467"/>
+        <location filename="../equipment.c" line="104"/>
+        <location filename="../planner.c" line="976"/>
+        <location filename="../planner.c" line="979"/>
+        <location filename="../statistics.c" line="355"/>
         <source>air</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="170"/>
+        <location filename="../equipment.c" line="210"/>
         <source>integrated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="171"/>
+        <location filename="../equipment.c" line="211"/>
         <source>belt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="172"/>
+        <location filename="../equipment.c" line="212"/>
         <source>ankle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="173"/>
+        <location filename="../equipment.c" line="213"/>
         <source>backplate weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="174"/>
+        <location filename="../equipment.c" line="214"/>
         <source>clip-on</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2973,251 +3322,251 @@ Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>deco stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>rbt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ascent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>workload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>transmitter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>violation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>surface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>safety stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
         <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>gaschange</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (voluntary)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (mandatory)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>deepstop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>ceiling (safety stop)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>divetime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>maxdepth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>OLF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>PO2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>airtime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>rgbm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>heading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>tissue level warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>non stop time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="163"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>invalid event number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="405"/>
+        <location filename="../libdivecomputer.c" line="408"/>
         <source>Unable to create parser for %s %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="411"/>
+        <location filename="../libdivecomputer.c" line="414"/>
         <source>Error registering the data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="419"/>
+        <location filename="../libdivecomputer.c" line="422"/>
         <source>Error parsing the datetime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="438"/>
         <source>Dive %d: %s %d %04d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="440"/>
+        <location filename="../libdivecomputer.c" line="443"/>
         <source>Error parsing the divetime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="449"/>
+        <location filename="../libdivecomputer.c" line="452"/>
         <source>Error parsing the maxdepth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="458"/>
+        <location filename="../libdivecomputer.c" line="461"/>
         <source>Error parsing the gas mix count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="470"/>
+        <location filename="../libdivecomputer.c" line="473"/>
         <source>Error obtaining water salinity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the gas mix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="493"/>
+        <location filename="../libdivecomputer.c" line="496"/>
         <source>Error parsing the samples</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="623"/>
+        <location filename="../libdivecomputer.c" line="626"/>
         <source>Event: waiting for user action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="631"/>
+        <location filename="../libdivecomputer.c" line="634"/>
         <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="691"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the event handler.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="696"/>
+        <location filename="../libdivecomputer.c" line="699"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="717"/>
+        <location filename="../libdivecomputer.c" line="720"/>
         <source>Dive data import error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="756"/>
+        <location filename="../libdivecomputer.c" line="759"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="763"/>
+        <location filename="../libdivecomputer.c" line="766"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="462"/>
+        <location filename="../parse-xml.c" line="466"/>
         <source>Strange percentage reading %s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1625"/>
+        <location filename="../parse-xml.c" line="1683"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1846"/>
+        <location filename="../parse-xml.c" line="1904"/>
         <source>Database query get_events failed.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1853"/>
+        <location filename="../parse-xml.c" line="1911"/>
         <source>Database query get_tags failed.
 </source>
         <translation type="unfinished"></translation>
@@ -3229,552 +3578,604 @@ Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1887"/>
-        <location filename="../parse-xml.c" line="2034"/>
+        <location filename="../parse-xml.c" line="1945"/>
+        <location filename="../parse-xml.c" line="2092"/>
         <source>Database query failed &apos;%s&apos;.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1998"/>
+        <location filename="../parse-xml.c" line="2056"/>
         <source>Database query get_cylinders failed.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2005"/>
+        <location filename="../parse-xml.c" line="2063"/>
         <source>Database query get_changes failed.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2012"/>
+        <location filename="../parse-xml.c" line="2070"/>
         <source>Database query get_profile_sample failed.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2103"/>
+        <location filename="../parse-xml.c" line="2161"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="100"/>
-        <location filename="../statistics.c" line="361"/>
+        <location filename="../equipment.c" line="106"/>
         <source>EAN%d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="146"/>
-        <location filename="../planner.c" line="617"/>
-        <source>Can&apos;t find gas %d/%d</source>
+        <location filename="../planner.c" line="159"/>
+        <location filename="../planner.c" line="752"/>
+        <source>Can&apos;t find gas %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="308"/>
+        <location filename="../planner.c" line="345"/>
         <source>Too many gas mixes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="489"/>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
+        <location filename="../planner.c" line="526"/>
+        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="530"/>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
+        <location filename="../planner.c" line="535"/>
+        <source>based on GFlow = %d and GFhigh = %d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="539"/>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
+        <location filename="../planner.c" line="538"/>
+        <source>Subsurface dive plan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="550"/>
-        <source>Switch gas to %s
-</source>
+        <location filename="../planner.c" line="542"/>
+        <source>depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="558"/>
-        <source>Gas consumption:
-</source>
+        <location filename="../planner.c" line="545"/>
+        <source>runtime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="569"/>
-        <source>%.0f%s of %s
-</source>
+        <location filename="../planner.c" line="548"/>
+        <source>duration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="551"/>
+        <source>gas</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="585"/>
+        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="595"/>
+        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="606"/>
+        <source>%3.0f%s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
+        <source>%3dmin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="810"/>
+        <location filename="../planner.c" line="629"/>
+        <source>Switch gas to %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="638"/>
+        <source>Gas consumption:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="658"/>
+        <location filename="../planner.c" line="663"/>
+        <location filename="../planner.c" line="686"/>
+        <source>Warning:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="659"/>
+        <source>this is more gas than available in the specified cylinder!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="664"/>
+        <source>not enough reserve for gas sharing on ascent!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="666"/>
+        <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="668"/>
+        <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="683"/>
+        <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="980"/>
         <source>ean</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1226"/>
+        <location filename="../profile.c" line="1250"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1229"/>
+        <location filename="../profile.c" line="1253"/>
         <source>P: %d%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1233"/>
+        <location filename="../profile.c" line="1257"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1263"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1242"/>
-        <source>SAC: %2.1fl/min
+        <location filename="../profile.c" line="1266"/>
+        <source>SAC: %.*f%s/min
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1244"/>
+        <location filename="../profile.c" line="1268"/>
         <source>CNS: %u%%
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1246"/>
+        <location filename="../profile.c" line="1270"/>
         <source>pO%s: %.2fbar
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1272"/>
         <source>pN%s: %.2fbar
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="1274"/>
         <source>pHe: %.2fbar
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="1277"/>
         <source>MOD: %d%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1260"/>
+        <location filename="../profile.c" line="1284"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1264"/>
+        <location filename="../profile.c" line="1288"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1276"/>
+        <location filename="../profile.c" line="1300"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1279"/>
+        <location filename="../profile.c" line="1303"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="1308"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
+        <location filename="../profile.c" line="1311"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1291"/>
+        <location filename="../profile.c" line="1315"/>
         <source>In deco
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1293"/>
+        <location filename="../profile.c" line="1317"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1297"/>
+        <location filename="../profile.c" line="1321"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1305"/>
+        <location filename="../profile.c" line="1329"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1307"/>
+        <location filename="../profile.c" line="1331"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1310"/>
+        <location filename="../profile.c" line="1334"/>
         <source>TTS: %umin (calc)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1313"/>
+        <location filename="../profile.c" line="1337"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1319"/>
+        <location filename="../profile.c" line="1343"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1325"/>
+        <location filename="../profile.c" line="1349"/>
         <source>heartbeat: %d
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1327"/>
+        <location filename="../profile.c" line="1351"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1419"/>
+        <location filename="../profile.c" line="1443"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1423"/>
-        <location filename="../profile.c" line="1427"/>
-        <location filename="../profile.c" line="1431"/>
+        <location filename="../profile.c" line="1447"/>
+        <location filename="../profile.c" line="1451"/>
+        <location filename="../profile.c" line="1455"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1435"/>
+        <location filename="../profile.c" line="1459"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1439"/>
+        <location filename="../profile.c" line="1463"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1443"/>
-        <location filename="../profile.c" line="1447"/>
+        <location filename="../profile.c" line="1467"/>
+        <location filename="../profile.c" line="1471"/>
         <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1454"/>
+        <location filename="../profile.c" line="1478"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="273"/>
+        <location filename="../qt-gui.cpp" line="281"/>
         <source>C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="276"/>
+        <location filename="../qt-gui.cpp" line="284"/>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="392"/>
-        <source>%1, %2 %3, %4 %5:%6</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="405"/>
-        <source>%1 %2, %3
-%4:%5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="418"/>
+        <location filename="../qt-gui.cpp" line="417"/>
         <source>%1 %2 (%3 dives)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="423"/>
+        <location filename="../qt-gui.cpp" line="422"/>
         <source>%1 %2 (1 dive)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>boat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>shore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>drift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>deep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>cavern</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>ice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>wreck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>cave</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>altitude</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>pool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>lake</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>river</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>night</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>fresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>student</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>photo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>instructor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="25"/>
         <source>deco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="216"/>
+        <location filename="../dive.c" line="133"/>
+        <source>ℓ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="214"/>
         <source>more than %d days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="220"/>
         <source>%dd %dh %dmin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="224"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dh %dmin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="235"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="242"/>
+        <location filename="../statistics.c" line="240"/>
         <source>for selected dives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="275"/>
         <source>for dive #%d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for selected dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for all dives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="283"/>
+        <location filename="../statistics.c" line="281"/>
         <source>(no dives)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Apr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>May</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Jul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Aug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3799,97 +4200,97 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="107"/>
+        <location filename="../uemis-downloader.c" line="111"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="379"/>
+        <location filename="../uemis-downloader.c" line="383"/>
         <source>Reading %s %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="399"/>
+        <location filename="../uemis-downloader.c" line="403"/>
         <source>data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="420"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>divelog entry id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="422"/>
+        <location filename="../uemis-downloader.c" line="426"/>
         <source>divespot data id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
+        <location filename="../uemis-downloader.c" line="428"/>
         <source>more data dive id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>wetsuit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>semidry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>drysuit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>shorty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>vest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>long john</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>jacket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>full suit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>2 pcs full suit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="620"/>
+        <location filename="../uemis-downloader.c" line="624"/>
         <source>membrane</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="802"/>
+        <location filename="../uemis-downloader.c" line="823"/>
         <source>Init Communication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="804"/>
+        <location filename="../uemis-downloader.c" line="825"/>
         <source>Uemis init failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="815"/>
+        <location filename="../uemis-downloader.c" line="836"/>
         <source>Start download</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3910,17 +4311,17 @@ Is the Uemis Zurich plugged in correctly?</source>
     </message>
     <message>
         <location filename="../uemis.c" line="203"/>
-        <source>PO2 Green Warning</source>
+        <source>pO₂ Green Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
-        <source>PO2 Ascend Warning</source>
+        <source>pO₂ Ascend Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../uemis.c" line="208"/>
-        <source>PO2 Ascend Alarm</source>
+        <source>pO₂ Ascend Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3983,5 +4384,214 @@ Is the Uemis Zurich plugged in correctly?</source>
         <source>Low Battery Alert</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../save-html.c" line="272"/>
+        <location filename="../worldmap-save.c" line="106"/>
+        <source>Can&apos;t open file %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="36"/>
+        <source>Date:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="38"/>
+        <source>Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="40"/>
+        <source>Duration:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="41"/>
+        <source>min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="43"/>
+        <source>Max Depth:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="46"/>
+        <source>Air Temp:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="48"/>
+        <source>Water Temp:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="50"/>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="54"/>
+        <source>Notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>plannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="35"/>
+        <source>Rates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="56"/>
+        <source>Ascent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="77"/>
+        <source>below 75% avg. depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="84"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="101"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="118"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="135"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="181"/>
+        <source>m/min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="94"/>
+        <source>75%-50% avg. depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="111"/>
+        <source>50% avg. depth - 6m/20ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="128"/>
+        <source>6m/20ft to surface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="148"/>
+        <source>Descent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="200"/>
+        <source>surface to the bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="226"/>
+        <source>Planning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="247"/>
+        <source>GF low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="264"/>
+        <source>GF high</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
+        <source>Drop to first depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
+        <source>Last Stop at 6m/20ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>plan backgas breaks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="318"/>
+        <source>Gas Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <source>bottom SAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="349"/>
+        <source>deco SAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="359"/>
+        <source>bottom pO₂</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="389"/>
+        <source>bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="382"/>
+        <source>deco pO₂</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="421"/>
+        <source>Dive Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+        <source>In dive plan, show runtime (absolute time) of stops</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="445"/>
+        <source>display runtime</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="458"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="461"/>
+        <source>display segment duration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="471"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="474"/>
+        <source>display transitions in deco</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="481"/>
+        <source>verbatim diveplan</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>