Updated the transation files

Authors are tracked at transifex

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

28 files changed, 45833 insertions, 29016 deletions

diff --git a/translations/subsurface_bg_BG.ts b/translations/subsurface_bg_BG.ts
index dcbbcc006..bd30423ca 100644
--- a/translations/subsurface_bg_BG.ts
+++ b/translations/subsurface_bg_BG.ts
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="bg_BG" version="2.0">
+<defaultcodec>UTF-8</defaultcodec>
 <context>
     <name>CylindersModel</name>
     <message>
@@ -37,42 +38,42 @@
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="71"/>
+        <location filename="../qt-ui/models.cpp" line="70"/>
         <source>Switch at</source>
         <translation>Превключи при</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>Кликнете тук за да изтриете бутилка</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>Бутилката не може да бъде премахната</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>Този газ се използвза. Само бутилки, които не се използват в гмуркане могат да бъдат премахнати.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="507"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="508"/>
         <source>bar</source>
         <translation>бара</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="527"/>
+        <location filename="../qt-ui/models.cpp" line="532"/>
         <source>l</source>
         <translation>л</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="528"/>
+        <location filename="../qt-ui/models.cpp" line="533"/>
         <source>cuft</source>
         <translation>кб.фута</translation>
     </message>
@@ -100,22 +101,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>Модел</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Device ID</source>
         <translation>Име на устройство</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Nickname</source>
         <translation>Прякор</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>Кликнете тук за да изтриете гмуркачески компютър.</translation>
     </message>
@@ -123,190 +124,326 @@
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="90"/>
-        <source>air</source>
-        <translation>въздух</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="92"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</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>Връщане към OC</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> начало</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> край</translation>
     </message>
 </context>
 <context>
-    <name>DiveGasPressureItem</name>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="475"/>
-        <source>air</source>
-        <translation>въздух</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="476"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-</context>
-<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1258"/>
-        <source> l/min</source>
-        <translation>л/мин</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
-        <source> cuft/min</source>
-        <translation>кб.фута/мин</translation>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <source>/min</source>
+        <translation>/м</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>Покажи Търсене</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="706"/>
         <source>expand all</source>
         <translation>Разшири всички</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="740"/>
+        <location filename="../qt-ui/divelistview.cpp" line="707"/>
         <source>collapse all</source>
         <translation>Свиване на всички</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="741"/>
+        <location filename="../qt-ui/divelistview.cpp" line="708"/>
         <source>collapse others</source>
         <translation>Свиване на други</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>Изтрий гмуркане (гмуркания) от пътуване</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>Създай ново пътуване отгоре</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>Добави гмуркане (гмуркания) веднага над пътуване</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>Добави гмуркане(гмуркания) веднага под пътуване</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>Слей пътуване с горно пътуване</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>Слей пътуване с долно пътуване</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>Изтрий гмуркане (гмуркания)</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>Маркирай гмуркания (гмуркане) като невалидни</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
-        <source>save As</source>
-        <translation>Запиши като</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="763"/>
-        <source>export As UDDF</source>
-        <translation>Изнеси като UDDF файл</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="764"/>
-        <source>export As CSV</source>
-        <translation>Изнеси като CSV</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="744"/>
+        <source>renumber dive(s)</source>
+        <translation>преномерирай гмуркане (гмуркания)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="765"/>
+        <location filename="../qt-ui/divelistview.cpp" line="745"/>
         <source>shift times</source>
         <translation>времена на изместване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="766"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>load images</source>
         <translation>зареди изображения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="769"/>
-        <source>upload dive(s) to divelogs.de</source>
-        <translation>Качи гмуркане (гмуркания) към Divelogs.de</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Open Image Files</source>
+        <translation>Отвори изображения</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation>Изображения (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <source>merge selected dives</source>
+        <translation>Слей избраните гмуркания</translation>
+    </message>
+</context>
+<context>
+    <name>DiveLogExportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
+        <source>Export Dive Log Files</source>
+        <translation>Експортирай гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="795"/>
-        <source>Save Dives As...</source>
-        <translation>Запиши гмуркания като...</translation>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="24"/>
+        <source>General Export</source>
+        <translation>Общ експорт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="814"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="30"/>
+        <source>Export format</source>
+        <translation>Експорт формат</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="42"/>
+        <source>Subsurface XML</source>
+        <translation>Subsurface XML</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="61"/>
+        <source>UDDF</source>
+        <translation>UDDF</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="74"/>
+        <source>divelogs.de</source>
+        <translation>divelogs.de</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="84"/>
+        <source>CSV</source>
+        <translation>CSV</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="94"/>
+        <source>Worldmap</source>
+        <translation>Световна карта</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="107"/>
+        <source>Selection</source>
+        <translation>Селекция</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="116"/>
+        <source>Selected dives</source>
+        <translation>Избрани гмуркания</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="126"/>
+        <source>All dives</source>
+        <translation>Всички гмуркания</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="178"/>
+        <source>HTML</source>
+        <translation>HTML</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="184"/>
+        <source>General Settings</source>
+        <translation>Общи настройки</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="190"/>
+        <source>Subsurface Numbers</source>
+        <translation>Subsurface числа</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="203"/>
+        <source>Selected Dives</source>
+        <translation>Избрани гмуркания</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="216"/>
+        <source>Minimum Javascript</source>
+        <translation>Минимален Javascript</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="229"/>
+        <source>All Dives</source>
+        <translation>Всички гмуркания</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="239"/>
+        <source>Export List only</source>
+        <translation>Експортирай само списъка</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="252"/>
+        <source>Style Options</source>
+        <translation>Стилови настройки</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="264"/>
+        <source>Font</source>
+        <translation>Шрифт</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="274"/>
+        <source>Font size</source>
+        <translation>Големина на шрифта</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
+        <source>8</source>
+        <translation>8</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <source>10</source>
+        <translation>10</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <source>12</source>
+        <translation>12</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <source>14</source>
+        <translation>14</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <source>16</source>
+        <translation>16</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <source>18</source>
+        <translation>18</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <source>20</source>
+        <translation>20</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="323"/>
+        <source>Theme</source>
+        <translation>Тема</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
+        <source>Light</source>
+        <translation>Светла</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <source>Sand</source>
+        <translation>Пясък</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="153"/>
         <source>Export UDDF File as</source>
         <translation>Изнеси UDDF файл като</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>UDDF файлове (*.uddf *.UDDF)</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>Изнеси СSV файл като</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>CSV файлове (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Open Image Files</source>
-        <translation>Отвори изображения</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="162"/>
+        <source>Export World Map</source>
+        <translation>Изнеси световна карта</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
-        <translation>Изображения (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="163"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="177"/>
+        <source>HTML files (*.html)</source>
+        <translation>HTML файлове (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="760"/>
-        <source>merge selected dives</source>
-        <translation>Слей избраните гмуркания</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="167"/>
+        <source>Export Subsurface XML</source>
+        <translation>Експорт на Subsurface XML</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="168"/>
+        <source>XML files (*.xml *.ssrf)</source>
+        <translation>XML файлове (*.xml *.ssrf)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="176"/>
+        <source>Export HTML files as</source>
+        <translation>Експортирай HTML файлове като</translation>
     </message>
 </context>
 <context>
@@ -317,138 +454,133 @@
         <translation>Вмъкни гмуркачески регистър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="36"/>
-        <source>Import CSV Dive Log Files</source>
-        <translation>Вмъкни CSV гмуркачески регистър</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="50"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
         <source>CSV options</source>
         <translation>CSV настройки</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>Разделител на полета</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>Пре-настроено вмъкване</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>Настройка на полета</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="80"/>
         <source>Depth</source>
         <translation>Дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="100"/>
         <source>Stopdepth</source>
         <translation>Дълбоч. стоп</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="107"/>
         <source>PO2</source>
         <translation>PO2</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>Време</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="121"/>
         <source>Temp</source>
         <translation>Температура</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="151"/>
         <source>Cns</source>
         <translation>Cns</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>Единици</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>Метрична</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>Империална</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="248"/>
         <source>Manual dives</source>
         <translation>Ръчнo добавени гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="283"/>
         <source>Dive #</source>
         <translation>Гмуркане №</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="317"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="385"/>
         <source>Duration</source>
         <translation>Продълж. (мин.)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="470"/>
         <source>Tags</source>
         <translation>Тагове</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
         <source>Location</source>
         <translation>Местонахождение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="453"/>
         <source>Gps</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="300"/>
         <source>Max depth</source>
         <translation>Макс. дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="334"/>
         <source>Mean depth</source>
         <translation>Средна дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="368"/>
         <source>Buddy</source>
         <translation>Партньор</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="402"/>
         <source>Notes</source>
         <translation>Бележки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="436"/>
         <source>Weight</source>
         <translation>Тежест</translation>
     </message>
@@ -456,105 +588,70 @@
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="71"/>
-        <source>Bottom SAC</source>
-        <translation>Долен SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="85"/>
-        <source>SAC on DECO Stop</source>
-        <translation>SAC и DECO стоп</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="106"/>
+        <source>Planned Dive Time</source>
+        <translation>Планирано гмуркаческо време</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="78"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="98"/>
-        <source>GFLow</source>
-        <translation>GFLow</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="125"/>
-        <source>Last Stop at 6m</source>
-        <translation>Последен стоп на 6 метра</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="174"/>
-        <source>Start Time</source>
-        <translation>Стартово време</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="134"/>
+        <source>Altitude</source>
+        <translation>Височина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="181"/>
+        <location filename="../qt-ui/diveplanner.ui" line="141"/>
         <source>ATM Pressure</source>
         <translation>АТМ налягане</translation>
     </message>
-</context>
-<context>
-    <name>DivePlannerGraphics</name>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="114"/>
-        <source>10m</source>
-        <translation>10м</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="116"/>
-        <source>30ft</source>
-        <translation>30фута</translation>
-    </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="363"/>
-        <source>Handler Position Error</source>
-        <translation>Грешка при позицията на държача</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="148"/>
+        <source>mbar</source>
+        <translation>м.бара</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>
-        <translation>Един или повече от вашите стопове ще бъдат загубени
-при тази операция. Моля, първо ги премахнете.</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="158"/>
+        <source>m</source>
+        <translation>м</translation>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="445"/>
-        <source>AIR</source>
-        <translation>Въздух</translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="137"/>
+        <source>unknown</source>
+        <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1148"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="586"/>
         <source>Final Depth</source>
         <translation>Финална дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1150"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="588"/>
         <source>Run time</source>
         <translation>Teчащо време</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1152"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="590"/>
         <source>Duration</source>
         <translation>Продълж. (мин.)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1154"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="592"/>
         <source>Used Gas</source>
         <translation>Използван газ</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>CC Set Point</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>Изтрий плана?</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>Вие ще изтриете плана.</translation>
     </message>
@@ -562,17 +659,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>Точки в гмуркачески плановик</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="256"/>
         <source>Available Gases</source>
         <translation>Достъпни газове</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>Добави точка в гмуркането</translation>
     </message>
@@ -616,10 +713,25 @@ 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>Налягане S</translation>
     </message>
     <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <source>pN₂</source>
+        <translation>pN₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>pHe</source>
+        <translation>pHe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Pressure I</source>
         <translation>Налягане I</translation>
@@ -634,86 +746,71 @@ Please, remove them first.</source>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
-        <source>PN2</source>
-        <translation>PN2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
-        <source>PHE</source>
-        <translation>PHE</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
-        <source>PO2</source>
-        <translation>PO2</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>№</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>date</source>
         <translation>дата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>m</source>
         <translation>м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>ft</source>
         <translation>фута</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1298"/>
         <source>min</source>
         <translation>мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>lbs</source>
         <translation>паунда</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
+        <location filename="../qt-ui/models.cpp" line="1307"/>
         <source>suit</source>
         <translation>водолазен костюм</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1310"/>
         <source>cyl</source>
         <translation>бут.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1344"/>
+        <location filename="../qt-ui/models.cpp" line="1325"/>
         <source>location</source>
         <translation>местонахождение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1316"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1338"/>
+        <location filename="../qt-ui/models.cpp" line="1319"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1341"/>
+        <location filename="../qt-ui/models.cpp" line="1322"/>
         <source>maxCNS</source>
         <translation>макс CNS</translation>
     </message>
@@ -721,115 +818,115 @@ 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>Грешен отговор от сървъра</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>Очакван XML таг &apos;DiveDateReader&apos;, вместо това получен &apos;%1</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>Очакван XML таг &apos;DiveDates&apos; не беше намерен</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>Грешен XML отговор. Ред %1: %2</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>няма избрани гмуркания</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>не може да бъде създаден ZIP файл за качване: %s</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>не може да бъде създаден временен файл: %s</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>вътрешна грешка: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="181"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="179"/>
         <source>internal error</source>
         <translation>вътрешна грешка</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>Готово</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>Обновяване на списъка от гмуркания...</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>Изтегляне на списък от гмуркания...</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>Изтегляне на %1 гмуркания...</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>Изтеглянето приключи - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
         <source>Corrupted download</source>
         <translation>Неправилно изтегляне</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>Архива не може да бъде отворен:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Upload failed</source>
         <translation>Грешка при качването</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="849"/>
         <source>Upload successful</source>
         <translation>Успешно качване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="854"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="852"/>
         <source>Login failed</source>
         <translation>Грешка при логин</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>Не може да бъде направен разбор на отговора</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="868"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Error: %1</source>
         <translation>Грешка: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="835"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/>
         <source>Upload finished</source>
         <translation>Качването приключи</translation>
     </message>
@@ -837,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>ОК</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="165"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/>
         <source>Error</source>
         <translation>Грешка</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>Опитай пак</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>Намери Uemis леководолазен компютър</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>Изберете регистър файл при изтегляне</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>Регистър файлове (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="339"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
         <source>Warning</source>
         <translation>Предупреждение</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>Записването на libdivecomputer дъмп НЕ обновява списъка на гмуркания</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>Изберете файл за libdivecomputer дъмп</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>Дъмп файлове (*.bin)</translation>
     </message>
@@ -952,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>Редактирай избраните местонахождения</translation>
     </message>
@@ -961,848 +1058,858 @@ 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>Бележки</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>Местонахождение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="148"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Coordinates</source>
         <translation>Координати</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="169"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
         <source>Divemaster</source>
         <translation>Водач</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="155"/>
+        <location filename="../qt-ui/maintab.ui" line="148"/>
         <source>Buddy</source>
         <translation>Партньор</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="63"/>
-        <source>Start time</source>
-        <translation>Стартово време</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>Темп. на въздух</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>Темп. на водата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="127"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Tags</source>
         <translation>Тагове</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="223"/>
         <source>Rating</source>
         <translation>Оценка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="236"/>
         <source>Visibility</source>
         <translation>Видимост</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="215"/>
+        <location filename="../qt-ui/maintab.ui" line="127"/>
         <source>Suit</source>
         <translation>Водолазен костюм</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>Бележки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="270"/>
+        <location filename="../qt-ui/maintab.ui" line="311"/>
         <source>Equipment</source>
         <translation>Екипировка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="350"/>
+        <location filename="../qt-ui/maintab.ui" line="391"/>
         <source>Dive Info</source>
         <translation>Информация</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>Дата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="414"/>
+        <location filename="../qt-ui/maintab.ui" line="275"/>
+        <source>Time</source>
+        <translation>Време</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="455"/>
         <source>Interval</source>
         <translation>Интервал</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="433"/>
+        <location filename="../qt-ui/maintab.ui" line="474"/>
         <source>Gases Used</source>
         <translation>Използвани газове</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="452"/>
+        <location filename="../qt-ui/maintab.ui" line="493"/>
         <source>Gas Consumed</source>
         <translation>Консумиран газ</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>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="531"/>
         <source>Max. Depth</source>
         <translation>Макс. дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="509"/>
+        <location filename="../qt-ui/maintab.ui" line="550"/>
         <source>Ave. Depth</source>
         <translation>Средна дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="528"/>
+        <location filename="../qt-ui/maintab.ui" line="569"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="547"/>
+        <location filename="../qt-ui/maintab.ui" line="588"/>
         <source>Air Pressure</source>
         <translation>Атмосф. налягане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="566"/>
+        <location filename="../qt-ui/maintab.ui" line="607"/>
         <source>Air Temperature</source>
         <translation>Темп. на въздуха</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="585"/>
+        <location filename="../qt-ui/maintab.ui" line="626"/>
         <source>Water Temperature</source>
         <translation>Темп. на водата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="604"/>
+        <location filename="../qt-ui/maintab.ui" line="645"/>
         <source>Dive Time</source>
         <translation>Време</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="623"/>
+        <location filename="../qt-ui/maintab.ui" line="664"/>
         <source>Salinity</source>
         <translation>Соленост</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="660"/>
+        <location filename="../qt-ui/maintab.ui" line="701"/>
         <source>Stats</source>
         <translation>Статистики</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="746"/>
         <source>Depth</source>
         <translation>Дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Temperature</source>
         <translation>Температура:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="784"/>
         <source>Duration</source>
         <translation>Продълж. (мин.)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Total Time</source>
         <translation>Общо време</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="835"/>
         <source>Dives</source>
         <translation>Гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
+        <source>Gas Consumption</source>
+        <translation>Гас консумация</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="919"/>
+        <source>Photos</source>
+        <translation>Снимки</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="89"/>
         <source>Cylinders</source>
         <translation>Бутилки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="90"/>
         <source>Add Cylinder</source>
         <translation>Добави бутилка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="93"/>
         <source>Weights</source>
         <translation>Тежести</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>Добави система за тежест</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="438"/>
+        <location filename="../qt-ui/maintab.cpp" line="409"/>
         <source>Trip Location</source>
         <translation>Местонахождение на пътуване</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>Бележки за пътуване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="42"/>
+        <location filename="../qt-ui/maintab.cpp" line="48"/>
         <source>Save</source>
         <translation>Запиши</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="46"/>
+        <location filename="../qt-ui/maintab.cpp" line="52"/>
         <source>Cancel</source>
         <translation>Отмяна</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>Tемп. на въздуха [%1]</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>Темп. на водата [%1]</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>Това пътуване се редактира.</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>Редактира се повече от едно гмуркане.</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>Това гмуркане се редактира.</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>/м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="494"/>
+        <location filename="../qt-ui/maintab.cpp" line="464"/>
         <source>unknown</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>N</source>
-        <translation>С</translation>
+        <location filename="../qt-ui/maintab.cpp" line="501"/>
+        <source>Deepest Dive</source>
+        <translation>Най-дълбоко гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>S</source>
-        <translation>Ю</translation>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <source>Shallowest Dive</source>
+        <translation>Най-плитко гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>E</source>
-        <translation>И</translation>
+        <location filename="../qt-ui/maintab.cpp" line="794"/>
+        <source>Discard the Changes?</source>
+        <translation>Изтрий промените?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>W</source>
-        <translation>З</translation>
+        <location filename="../qt-ui/maintab.cpp" line="795"/>
+        <source>You are about to discard your changes.</source>
+        <translation>Вие ще изтриете промените.</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>Филтър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="571"/>
+        <location filename="../qt-ui/mainwindow.ui" line="646"/>
         <source>&amp;File</source>
         <translation>&amp;Файл</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>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Детайли за гмуркачески план&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="583"/>
+        <source>Print</source>
+        <translation>Напечатай</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:'Courier'; 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>&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;</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
         <source>&amp;Log</source>
         <translation>&amp;Регистър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="606"/>
+        <location filename="../qt-ui/mainwindow.ui" line="679"/>
         <source>&amp;View</source>
         <translation>&amp;Изглед</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="628"/>
+        <location filename="../qt-ui/mainwindow.ui" line="701"/>
         <source>&amp;Help</source>
         <translation>&amp;Помощ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="636"/>
+        <location filename="../qt-ui/mainwindow.ui" line="709"/>
         <source>&amp;Import</source>
         <translation>&amp;Вмъкване</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>&amp;Нов регистър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="655"/>
+        <location filename="../qt-ui/mainwindow.ui" line="728"/>
         <source>New</source>
         <translation>Нов</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="658"/>
+        <location filename="../qt-ui/mainwindow.ui" line="731"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</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>&amp;Отвори регистър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="666"/>
+        <location filename="../qt-ui/mainwindow.ui" line="739"/>
         <source>Open</source>
         <translation>Отвори</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <location filename="../qt-ui/mainwindow.ui" line="742"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="674"/>
+        <location filename="../qt-ui/mainwindow.ui" line="747"/>
         <source>&amp;Save</source>
         <translation>&amp;Запиши</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="677"/>
+        <location filename="../qt-ui/mainwindow.ui" line="750"/>
         <source>Save</source>
         <translation>Запиши</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="680"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</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>З&amp;апиши като</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>Save as</source>
         <translation>Запиши като...</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>Ctrl+Shift+S</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>&amp;Затвори</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Close</source>
         <translation>Затвори</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="702"/>
+        <location filename="../qt-ui/mainwindow.ui" line="775"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="902"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <source>P&amp;references</source>
+        <translation>На&amp;стройки</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="831"/>
+        <source>&amp;Add Dive</source>
+        <translation>Доб&amp;ави гмуркане</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <source>Auto &amp;Group</source>
+        <translation>Автоматично &amp;групиране</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="863"/>
+        <source>&amp;Dive List</source>
+        <translation>&amp;Списък на гмуркания</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="871"/>
+        <source>&amp;Profile</source>
+        <translation>&amp;Профил</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="879"/>
+        <source>&amp;Info</source>
+        <translation>&amp;Информация</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="887"/>
+        <source>&amp;All</source>
+        <translation>&amp;Всички</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="895"/>
+        <source>P&amp;rev DC</source>
+        <translation>&amp;Предишен ГК</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="903"/>
+        <source>&amp;Next DC</source>
+        <translation>&amp;Следващ ГК</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="911"/>
+        <source>&amp;Select Events</source>
+        <translation>&amp;Избери събития</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <source>&amp;About Subsurface</source>
+        <translation>&amp;За Subsurface</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="937"/>
+        <source>&amp;Globe</source>
+        <translation>&amp;Глобус</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="953"/>
+        <source>&amp;Import Log Files</source>
+        <translation>&amp;Вмъкни регистър файлове</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="959"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="707"/>
-        <source>Export &amp;UDDF</source>
-        <translation>Изнеси на &amp;UDDF...</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="1008"/>
+        <source>&amp;Export</source>
+        <translation>&amp;Експорт</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1011"/>
+        <source>Export Dive Logs</source>
+        <translation>Експорт на гмуркачески регистри</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1014"/>
+        <source>Ctrl+E</source>
+        <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Enable the pN2 Graph</source>
         <translation>Включи pN2 графиката</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <location filename="../qt-ui/mainwindow.ui" line="128"/>
         <source>Enable the pHe graph</source>
         <translation>Покажи pHе графиката</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <location filename="../qt-ui/mainwindow.ui" line="290"/>
         <source>Show/hide heart rate</source>
         <translation>Покажи/скрий пулс</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <location filename="../qt-ui/mainwindow.ui" line="342"/>
         <source>Enable EAD, END, and EADD</source>
         <translation>Включи EAD, END и EADD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="238"/>
         <source>Show NDL / TTS</source>
         <translation>Покажи NDL / TTS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="456"/>
+        <location filename="../qt-ui/mainwindow.ui" line="394"/>
         <source>Rescale depth axis</source>
         <translation>Промени скалата на дълбочинната ос</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="710"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="715"/>
-        <source>Export HTML World Map</source>
-        <translation>Изнеси HTML световна карта</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="718"/>
-        <source>Ctrl+H</source>
-        <translation>CTRL+H</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="723"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>&amp;Print</source>
         <translation>&amp;Напечатай</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="734"/>
+        <location filename="../qt-ui/mainwindow.ui" line="791"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="742"/>
+        <location filename="../qt-ui/mainwindow.ui" line="799"/>
         <source>&amp;Quit</source>
         <translation>&amp;Изход</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="753"/>
+        <location filename="../qt-ui/mainwindow.ui" line="810"/>
         <source>Import from &amp;dive computer</source>
         <translation>Изтегли от леководолазен &amp;компютър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="818"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation>Вмъкни &amp;GPS данни от Subsurface Service</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="764"/>
+        <location filename="../qt-ui/mainwindow.ui" line="821"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="826"/>
         <source>&amp;Edit Device Names</source>
         <translation>&amp;Редактирай имена на устройства</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="834"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="782"/>
+        <location filename="../qt-ui/mainwindow.ui" line="839"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Преномерирай</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="785"/>
+        <location filename="../qt-ui/mainwindow.ui" line="842"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="798"/>
+        <location filename="../qt-ui/mainwindow.ui" line="855"/>
         <source>&amp;Yearly Statistics</source>
         <translation>Годишни &amp;статистики</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="801"/>
+        <location filename="../qt-ui/mainwindow.ui" line="858"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="806"/>
-        <source>Dive List</source>
-        <translation>Списък на гмуркания</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="814"/>
-        <source>Profile</source>
-        <translation>Профил</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="822"/>
-        <source>Info</source>
-        <translation>Информация</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="830"/>
-        <source>All</source>
-        <translation>Всички</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="872"/>
+        <location filename="../qt-ui/mainwindow.ui" line="929"/>
         <source>User &amp;Manual</source>
         <translation>Ръководство за &amp;потребителя</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="880"/>
-        <source>Globe</source>
-        <translation>Глобус</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="888"/>
+        <location filename="../qt-ui/mainwindow.ui" line="945"/>
         <source>P&amp;lan Dive</source>
         <translation>&amp;Планирай гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="891"/>
+        <location filename="../qt-ui/mainwindow.ui" line="948"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="907"/>
-        <source>Import from Divelogs.de</source>
-        <translation>Вмъкни от Divelogs.de</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1003"/>
         <source>&amp;Check for Updates</source>
         <translation>&amp;Провери за обновления</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="951"/>
-        <source>Export CSV</source>
-        <translation>Изнеси CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="726"/>
+        <location filename="../qt-ui/mainwindow.ui" line="783"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</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>Включи pO2 графиката</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>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="316"/>
         <source>Enable MOD</source>
         <translation>Включи MOD</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>Покажи отчетен таван на гмуркачески компютър</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>Покажи калкулиран таван</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>Покажи калкулиран таван с 3м нарастване</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>Калкулирай всички тъкани</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>Покажи SAC скорост</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>Включи / изключи линията</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="731"/>
-        <source>Preferences</source>
-        <translation>Настройки</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="745"/>
+        <location filename="../qt-ui/mainwindow.ui" line="802"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="756"/>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="774"/>
-        <source>Add Dive</source>
-        <translation>Добави гмуркане</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="793"/>
-        <source>Auto Group</source>
-        <translation>Автоматично групиране</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="809"/>
+        <location filename="../qt-ui/mainwindow.ui" line="866"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="817"/>
+        <location filename="../qt-ui/mainwindow.ui" line="874"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <location filename="../qt-ui/mainwindow.ui" line="882"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="833"/>
+        <location filename="../qt-ui/mainwindow.ui" line="890"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="838"/>
-        <source>Prev DC</source>
-        <translation>Предишен ГК</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="841"/>
+        <location filename="../qt-ui/mainwindow.ui" line="898"/>
         <source>Left</source>
         <translation>Ляво</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="846"/>
-        <source>Next DC</source>
-        <translation>Следващ ГК</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="849"/>
+        <location filename="../qt-ui/mainwindow.ui" line="906"/>
         <source>Right</source>
         <translation>Дясно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="854"/>
-        <source>Select Events</source>
-        <translation>Избери събития</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <location filename="../qt-ui/mainwindow.ui" line="916"/>
         <source>Input Plan</source>
         <translation>Въведи план</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="864"/>
-        <source>About Subsurface</source>
-        <translation>За Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="875"/>
+        <location filename="../qt-ui/mainwindow.ui" line="932"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="883"/>
+        <location filename="../qt-ui/mainwindow.ui" line="940"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="896"/>
-        <source>Import Log Files</source>
-        <translation>Вмъкни регистър файлове</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="899"/>
+        <location filename="../qt-ui/mainwindow.ui" line="956"/>
         <source>Import divelog files from other applications</source>
         <translation>Вмъкни регистър файлове от други приложения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="915"/>
+        <location filename="../qt-ui/mainwindow.ui" line="964"/>
+        <source>Import &amp;from Divelogs.de</source>
+        <translation>&amp;Вмъкни от Divelogs.de</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="972"/>
         <source>&amp;Full Screen</source>
         <translation>&amp;Цял екран</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>Превключи цял екран</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <location filename="../qt-ui/mainwindow.ui" line="978"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="174"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
         <source>Open File</source>
         <translation>Отвори файл</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>Моля затворете текущата редакция на гмуркане преди да затворите файла.</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>
-        <translation>Моля запишете или отменете текущата редакция на гмуркане преди да отворите плановика.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="396"/>
+        <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>Моля запишете или отменете текущата редакция на гмуркане преди да добавите гмуркане.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="645"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="419"/>
+        <source>Print runtime table</source>
+        <translation>Напечатай рунтайм таблица</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="710"/>
         <source>Do you want to save the changes you made in the file %1?</source>
         <translation>Желаете ли да запишете промените във файла %1?</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>Желаете ли да запишете промените във файла с данни?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="652"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="717"/>
         <source>Save Changes?</source>
         <translation>Запиши промените?</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>Промените ще бъдат изгубени ако не ги запишете.</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>Запиши файла като</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>Предупреждение</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>Моля запишете или отменете текущата редакция на гмуркане преди да отворите нов файл.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="280"/>
-        <source>Export UDDF File as</source>
-        <translation>Изнеси UDDF файл като</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="281"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>UDDF файлове (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="289"/>
-        <source>Export CSV File as</source>
-        <translation>Изнеси СSV файл като</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="290"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>CSV файлове (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="299"/>
-        <source>Export World Map</source>
-        <translation>Изнеси световна карта</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="300"/>
-        <source>HTML files (*.html)</source>
-        <translation>HTML файлове (*.html)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="449"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="514"/>
         <source>Yearly Statistics</source>
         <translation>Годишни статистики</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="961"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1076"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML файлове (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1199"/>
         <source>Open Dive Log File</source>
         <translation>Отвори регистър файл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <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>Регистър файлове (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML Files (*.xml);;UDDF/UDCF Files(*.uddf *.udcf);;JDiveLog Files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1225"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Моля, първо приключете с редакцията преди да започнете нова.</translation>
     </message>
 </context>
 <context>
+    <name>PlannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Last stop at 20ft</source>
+        <translation>Последен стоп на 20фута</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="416"/>
+        <source>Last stop at 6m</source>
+        <translation>Последен стоп на 6 метра</translation>
+    </message>
+</context>
+<context>
     <name>PreferencesDialog</name>
     <message>
         <location filename="../qt-ui/preferences.ui" line="85"/>
@@ -1825,247 +1932,297 @@ Please, remove them first.</source>
         <translation>Език</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="141"/>
+        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <source>Network</source>
+        <translation>Мрежа</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="151"/>
         <source>Lists and Tables</source>
         <translation>Списъци и таблици</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font</source>
         <translation>Шрифт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="167"/>
         <source>Font size</source>
         <translation>Големина на шрифта</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="170"/>
+        <location filename="../qt-ui/preferences.ui" line="180"/>
         <source>Dives</source>
         <translation>Гмуркания</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>Файл по подразбиране</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="188"/>
+        <location filename="../qt-ui/preferences.ui" line="198"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="197"/>
+        <location filename="../qt-ui/preferences.ui" line="207"/>
         <source>Display Invalid</source>
         <translation>Невалиден дисплей</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="214"/>
+        <location filename="../qt-ui/preferences.ui" line="224"/>
         <source>Default Cylinder</source>
         <translation>Бутилка по подразбиране</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>Използвай бутилка по подразбиране</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <location filename="../qt-ui/preferences.ui" line="247"/>
         <source>Animations</source>
         <translation>Анимации</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <location filename="../qt-ui/preferences.ui" line="253"/>
         <source>Speed</source>
         <translation>Скорост</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="270"/>
+        <location filename="../qt-ui/preferences.ui" line="280"/>
         <source>Subsurface Webservice</source>
         <translation>Subsurface уеб услуга</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>Потребителски ID по подразбиране</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>Запази потребителски ID локално</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>Изтрий всички настройки</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="312"/>
+        <source>Reset all settings to their default value</source>
+        <translation>Върни всики настройки по подразбиране</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
         <source>System</source>
         <translation>Състема</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="348"/>
         <source>Metric</source>
         <translation>Метрична</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="333"/>
+        <location filename="../qt-ui/preferences.ui" line="358"/>
         <source>Imperial</source>
         <translation>Империална</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="343"/>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
         <source>Personalize</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="392"/>
         <source>Depth</source>
         <translation>Дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="374"/>
+        <location filename="../qt-ui/preferences.ui" line="399"/>
         <source>meter</source>
         <translation>метър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="409"/>
         <source>feet</source>
         <translation>фута</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="401"/>
+        <location filename="../qt-ui/preferences.ui" line="426"/>
         <source>bar</source>
         <translation>бара</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="411"/>
+        <location filename="../qt-ui/preferences.ui" line="436"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="428"/>
+        <location filename="../qt-ui/preferences.ui" line="453"/>
         <source>liter</source>
         <translation>литра</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="438"/>
+        <location filename="../qt-ui/preferences.ui" line="463"/>
         <source>cu ft</source>
         <translation>кб. фут</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="455"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>celsius</source>
         <translation>целзии</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="465"/>
+        <location filename="../qt-ui/preferences.ui" line="490"/>
         <source>fahrenheit</source>
         <translation>фаренхайт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="482"/>
+        <location filename="../qt-ui/preferences.ui" line="507"/>
         <source>kg</source>
         <translation>кг</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>праг при показване на pO₂</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>праг при показване на pN₂</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>праг при показване на pHe</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="636"/>
-        <source>max ppO₂ when showing MOD</source>
-        <translation>макс. ppO₂ при показване на MOD</translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="811"/>
+        <source>Proxy</source>
+        <translation>Прокси</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="817"/>
+        <source>Proxy type</source>
+        <translation>Прокси тип</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="830"/>
+        <source>Host</source>
+        <translation>Хост</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="856"/>
+        <source>Port</source>
+        <translation>Порт</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="882"/>
+        <source>Requires authentication</source>
+        <translation>Изисква автентификация</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
+        <source>Username</source>
+        <translation>Потребителско име</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="657"/>
+        <location filename="../qt-ui/preferences.ui" line="925"/>
+        <source>Password</source>
+        <translation>Парола</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="682"/>
         <source>draw dive computer reported ceiling red</source>
         <translation>покажи таван на гмуркачески компютър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="747"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>System Default</source>
         <translation>По подразбиране на системата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="767"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>Filter</source>
         <translation>Филтър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="419"/>
         <source>Pressure</source>
         <translation>Налягане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="421"/>
+        <location filename="../qt-ui/preferences.ui" line="446"/>
         <source>Volume</source>
         <translation>Обем</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="448"/>
+        <location filename="../qt-ui/preferences.ui" line="473"/>
         <source>Temperature</source>
         <translation>Температура:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="475"/>
+        <location filename="../qt-ui/preferences.ui" line="500"/>
         <source>Weight</source>
         <translation>Тежест</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="517"/>
         <source>lbs</source>
         <translation>паунда</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="507"/>
+        <location filename="../qt-ui/preferences.ui" line="532"/>
         <source>Time units</source>
         <translation>Единици за време</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>Знаменател за скорост на изкачване/спускане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="520"/>
+        <location filename="../qt-ui/preferences.ui" line="545"/>
         <source>Minutes</source>
         <translation>Минути</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="530"/>
+        <location filename="../qt-ui/preferences.ui" line="555"/>
         <source>Seconds</source>
         <translation>Секунди</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="562"/>
+        <location filename="../qt-ui/preferences.ui" line="587"/>
         <source>Show</source>
         <translation>Покажи</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>макс. ppO₂ при показване на MOD</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="693"/>
         <source>Show non-used cylinders in Equipment Tab</source>
         <translation>Покажи неизползвани бутилки в екипировка</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>покажи средна дълбочина</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>GFLow на макс. дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="691"/>
+        <location filename="../qt-ui/preferences.ui" line="716"/>
         <source>Misc</source>
         <translation>Общи</translation>
     </message>
@@ -2075,35 +2232,65 @@ Please, remove them first.</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="697"/>
+        <location filename="../qt-ui/preferences.ui" line="722"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="739"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="23"/>
+        <source>No proxy</source>
+        <translation>Без прокси</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="24"/>
+        <source>System proxy</source>
+        <translation>Системно прокси</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="25"/>
+        <source>HTTP proxy</source>
+        <translation>HTTP прокси</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="26"/>
+        <source>SOCKS proxy</source>
+        <translation>SOCKS прокси</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="245"/>
         <source>Restart required</source>
         <translation>Нужен рестарт</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>За да смените успешно език е необходим рестарт на Subsurface.</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>Отвори файла по подразбиране</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>Subsurface XML файлове (*.ssrf *.xml *.XML)</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="394"/>
+        <source>Warning</source>
+        <translation>Предупреждение</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>Ако изберете OK, всички настройки на Subsurface ще бъдат върнати по подразбиране. Това ще бъде изпълнено веднага.</translation>
+    </message>
 </context>
 <context>
     <name>PrintDialog</name>
@@ -2244,72 +2431,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>неизвестно</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>Гмуркане №%1 - %2</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>Макс. дълбочина: %1 %2</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>Времетраене: %1 мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1918"/>
+        <location filename="../qt-ui/models.cpp" line="1898"/>
         <source>Gas Used:</source>
         <translation>Използван газ:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1920"/>
+        <location filename="../qt-ui/models.cpp" line="1900"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1922"/>
+        <location filename="../qt-ui/models.cpp" line="1902"/>
         <source>Max. CNS:</source>
         <translation>Макс. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1924"/>
+        <location filename="../qt-ui/models.cpp" line="1904"/>
         <source>Weights:</source>
         <translation>Тежести:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1929"/>
+        <location filename="../qt-ui/models.cpp" line="1909"/>
         <source>Notes:</source>
         <translation>Бележки:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1936"/>
+        <location filename="../qt-ui/models.cpp" line="1916"/>
         <source>Divemaster:</source>
         <translation>Водач:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1938"/>
+        <location filename="../qt-ui/models.cpp" line="1918"/>
         <source>Buddy:</source>
         <translation>Партньор:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1940"/>
+        <location filename="../qt-ui/models.cpp" line="1920"/>
         <source>Suit:</source>
         <translation>Водолазен костюм:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1942"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>Viz:</source>
         <translation>Видимост:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1944"/>
+        <location filename="../qt-ui/models.cpp" line="1924"/>
         <source>Rating:</source>
         <translation>Оценка:</translation>
     </message>
@@ -2317,62 +2504,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> (№%1 от %2)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/>
+        <source>Make first divecomputer</source>
+        <translation>Направи първи гмуркачески компютър</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="906"/>
+        <source>Delete this divecomputer</source>
+        <translation>Изтрий този гмуркачески компютър</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="913"/>
         <source>Add Gas Change</source>
         <translation>Добави промяна на газа</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>Добави бележка</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>Премахни събитие</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>Премахни малки събития</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>Редактирай име</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>Покажи всички събития</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>Скрий събития</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>Скрий всички %1 събития?</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>Премахни избраните събития?</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>%1 @ %2:%3</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>Редактирай име в показалец</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>Потребителско име:</translation>
     </message>
@@ -2380,12 +2582,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>Въздух</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>Изтрий тази точка</translation>
     </message>
@@ -2395,22 +2597,22 @@ Please, remove them first.</source>
         <translation>Затвори</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="34"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation>Средно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="37"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation>Минимум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="40"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation>Максимум</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>Кликнете два пъти на глобус картата за да дефинирате местонахождение на гмуркането.</translation>
     </message>
@@ -2424,9 +2626,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>Нов стартов номер</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="126"/>
+        <source>New number</source>
+        <translation>Нов номер</translation>
+    </message>
+</context>
+<context>
+    <name>SearchBar</name>
+    <message>
+        <location filename="../qt-ui/searchbar.ui" line="14"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
 </context>
 <context>
     <name>ShiftImageTimesDialog</name>
@@ -2441,42 +2657,47 @@ Please, remove them first.</source>
         <translation>Измести време на изображение(изображенията) с</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="102"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="95"/>
+        <source>h:mm</source>
+        <translation>ч:мм</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="105"/>
         <source>earlier</source>
         <translation>по-рано</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="109"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="112"/>
         <source>later</source>
         <translation>по-късно</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>За да изчислите отклонението между времето на гмуркане от гмуркаческия компютър и камерата, използвайте камерата за да направите снимка на вашия гмуркачески компютър показващ настоящото време. Изтеглете това изображение на вашия компютър и натиснете този бутон.</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>Определи отклонение на времето на камерата</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>Избери снимка на гмуркачески компютър показващ времето</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>Коя дата и час са показани на снимката?</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>Отвори изображение</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>Изображения (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2556,42 +2777,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>Уеб услуга</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/>
         <source>Connecting...</source>
         <translation>Свръзване...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="421"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="419"/>
         <source>Download finished</source>
         <translation>Изтеглянето приключи</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>Грешка при изтеглянето: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/>
         <source>Connection Error: </source>
         <translation>Грешка при връзка: </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>Грешен потребителски ключ</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>Не може да бъде напревен разряд!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/>
         <source>Download Success!</source>
         <translation>Успешно изтегляне!</translation>
     </message>
@@ -2607,17 +2828,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>Описание</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>ml</source>
         <translation>мл.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>bar</source>
         <translation>бара</translation>
     </message>
@@ -2625,7 +2846,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>Информация</translation>
     </message>
@@ -2633,42 +2854,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>Провери за обновления</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="37"/>
-        <source>&lt;h3&gt;Subsurface was unable to check for updates.&lt;/h3&gt;</source>
-        <translation>&lt;h3&gt;Subsurface не успя да провери за обновления&lt;/h3&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="36"/>
+        <source>Subsurface was unable to check for updates.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
-        <source>&lt;br/&gt;&lt;b&gt;The following error occurred:&lt;/b&gt;&lt;br/&gt;</source>
-        <translation>&lt;br/&gt;&lt;b&gt;Грешка:&lt;/b&gt;&lt;br/&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="41"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="43"/>
-        <source>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Please check your internet connection.&lt;/b&gt;</source>
-        <translation>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Моля проверете интернет връзката си.&lt;/b&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
     </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>Вие използватe последната версия на Subsurface.</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>Има нова версия на Subsruface.&lt;br/&gt;Щракнете на:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; за да я изтеглите.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="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>&lt;b&gt;Има нова версия на Subsurface.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</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>Настъпи грешка при проверката за обновления.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -2676,25 +2897,167 @@ 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>Ръководство за потребителя</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>Начъчника на Subsurface не може да бъде намерен</translation>
     </message>
 </context>
 <context>
+    <name>UserSurvey</name>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>Диалог</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="47"/>
+        <source>Subsurface User Survey</source>
+        <translation>Subsurface потребителско изследвание</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>Бихме желали да научим повече за нашите потребители, тяхните настройки и навици. Моля, отделете минута да попълните тази форма и да я изпратите към авторите на Subsurface. Моля, изберете всички опции, които се отнасят към вас.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="79"/>
+        <source>Recreational DIver</source>
+        <translation>Развлекателен гмуркач</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="92"/>
+        <source>Tech Diver</source>
+        <translation>Тех гмуркач</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="105"/>
+        <source>Interested in dive planning</source>
+        <translation>Заинтересован към планиране на гмуркания</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="118"/>
+        <source>I am downloading dives from supported dive computer</source>
+        <translation>Тегля гмуркания от потдържан гмуркачески компютър</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="131"/>
+        <source>I am importing dives from other software / sources</source>
+        <translation>Вмъквам гмуркания от друг софтуер / източници</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="144"/>
+        <source>I am manually entering dives</source>
+        <translation>Ръчно въвеждам гмуркания</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="167"/>
+        <source>I use the Android companion app to track dive locations</source>
+        <translation>Използвам Android компаньон програмата да запазвам местонахождения</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="190"/>
+        <source>Please type suggestions (in English) in the following box</source>
+        <translation>Моля напишете предложения (на английски) в следното поле</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="203"/>
+        <source>The following information about your system will also be submitted</source>
+        <translation>Следната информация за вашата система ще бъде изпратена също</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="27"/>
+        <source>
+Operating System: %1</source>
+        <translation>
+Операционна система: %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="30"/>
+        <source>
+CPU Architecture: %1</source>
+        <translation>
+CPU архитектура: %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="35"/>
+        <source>
+OS CPU Architecture %1</source>
+        <translation>
+OS CPU архитектура %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="39"/>
+        <source>
+Language: %1</source>
+        <translation>
+Език: %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="73"/>
+        <source>Should we ask you later?</source>
+        <translation>Да ви попитаме ли по-късно?</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="74"/>
+        <source>Don&apos;t ask me again</source>
+        <translation>Не ме питайте отново</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="75"/>
+        <source>Ask Later</source>
+        <translation>Попитайте ме отново</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="76"/>
+        <source>Ask again?</source>
+        <translation>Да ви попитаме отново?</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <source>Submit User Survey.</source>
+        <translation>Изпрати потребителско изследване</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <source>Subsurface was unable to submit the user survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="101"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="102"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="111"/>
+        <source>Survey successfully submitted.</source>
+        <translation>Потребителското изследване изпратено успешно</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>Настъпи грешка при проверката за обновления.&lt;br/&gt;&lt;br/&gt;%1</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>Описание</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="723"/>
+        <location filename="../qt-ui/models.cpp" line="721"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
@@ -2742,12 +3105,12 @@ Please, remove them first.</source>
         <translation>Качи</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>Времето за операцията изтече</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="279"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="277"/>
         <source>Transfering data...</source>
         <translation>Трансфер на данни...</translation>
     </message>
@@ -2755,37 +3118,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>Тип</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="368"/>
+        <location filename="../qt-ui/models.cpp" line="373"/>
         <source>Weight</source>
         <translation>Тежест</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>Кликнете тук за да изтриете система за тежест.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="453"/>
+        <location filename="../qt-ui/models.cpp" line="458"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="454"/>
+        <location filename="../qt-ui/models.cpp" line="459"/>
         <source>lbs</source>
         <translation>паунда</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="478"/>
+        <location filename="../qt-ui/models.cpp" line="483"/>
         <source>ft</source>
         <translation>фута</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="484"/>
         <source>m</source>
         <translation>м</translation>
     </message>
@@ -2793,79 +3156,79 @@ 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>Година
  &gt; Месец / Пътуване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>#</source>
         <translation>№</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1643"/>
         <source>Duration 
  Total</source>
         <translation>Продължителност
 Общо</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>
 Average</source>
         <translation>
 Средно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>
 Shortest</source>
         <translation>
 Най-късо</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>
 Longest</source>
         <translation>
 Най-дълго</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>Дълбочина (%1)
 Средно</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>
 Минимум</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>
 Максимум</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>SAC (%1)
 Средно</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>Темп. (%1)
@@ -2875,99 +3238,92 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="58"/>
+        <location filename="../dive.c" line="87"/>
         <source>pascal</source>
         <translation>паскала</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>бара</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>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="104"/>
-        <location filename="../qt-gui.cpp" line="292"/>
-        <source>l</source>
-        <translation>л</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>кб.фута</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>м</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>фута</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>паунда</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>кг</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1120"/>
+        <location filename="../dive.c" line="1237"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) или (%s)</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>въздух</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="170"/>
+        <location filename="../equipment.c" line="210"/>
         <source>integrated</source>
         <translation>вградена</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="171"/>
+        <location filename="../equipment.c" line="211"/>
         <source>belt</source>
         <translation>колан</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="172"/>
+        <location filename="../equipment.c" line="212"/>
         <source>ankle</source>
         <translation>глезен</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="173"/>
+        <location filename="../equipment.c" line="213"/>
         <source>backplate weight</source>
         <translation>нагръбна</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="174"/>
+        <location filename="../equipment.c" line="214"/>
         <source>clip-on</source>
         <translation>щипка</translation>
     </message>
@@ -2984,253 +3340,253 @@ Maximum</source>
         <translation>Максималният потдържан брой на CSV колони е %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>none</source>
         <translation>няма</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>deco stop</source>
         <translation>деко. стоп</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ascent</source>
         <translation>покачване</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ceiling</source>
         <translation>таван</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>workload</source>
         <translation>натовареност</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>transmitter</source>
         <translation>предавател</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>violation</source>
         <translation>нарушение</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>bookmark</source>
         <translation>бележка</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>surface</source>
         <translation>повърхност</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>safety stop</source>
         <translation>безопасен стоп</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>смяна на газ</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (voluntary)</source>
         <translation>безопасен стоп (свободен)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (mandatory)</source>
         <translation>безопасен стоп (задължителен)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>deepstop</source>
         <translation>дълбочина на спиране</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>ceiling (safety stop)</source>
         <translation>таван (безопасен стоп)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>divetime</source>
         <translation>време за гмуркане</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>под</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>maxdepth</source>
         <translation>макс. дълбочина</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>airtime</source>
         <translation>време за въздух</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>heading</source>
         <translation>посока</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>tissue level warning</source>
         <translation>внимание: ниво на тъканта</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>non stop time</source>
         <translation>нон стоп време</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="163"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>invalid event number</source>
         <translation>грешен номер на събитие</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>Не може да бъде създаден разряд за %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="411"/>
+        <location filename="../libdivecomputer.c" line="414"/>
         <source>Error registering the data</source>
         <translation>Грешка при регистриране на данни</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="419"/>
+        <location filename="../libdivecomputer.c" line="422"/>
         <source>Error parsing the datetime</source>
         <translation>Грешка при разряд на дата и час</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="438"/>
         <source>Dive %d: %s %d %04d</source>
         <translation>Гмуркане №%d: %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="440"/>
+        <location filename="../libdivecomputer.c" line="443"/>
         <source>Error parsing the divetime</source>
         <translation>Грешка при рaзряд на време за гмуркане</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="449"/>
+        <location filename="../libdivecomputer.c" line="452"/>
         <source>Error parsing the maxdepth</source>
         <translation>Грешка при рaзряд на максимална дълбочина</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="458"/>
+        <location filename="../libdivecomputer.c" line="461"/>
         <source>Error parsing the gas mix count</source>
         <translation>Грешка при рaзряд на газ микс брой</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="470"/>
+        <location filename="../libdivecomputer.c" line="473"/>
         <source>Error obtaining water salinity</source>
         <translation>Грешка при прием на водна соленост</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error obtaining surface pressure</source>
         <translation>Грешка при прием на повърхностно налягане</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the gas mix</source>
         <translation>Грешка при рaзряд на газ микс</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="493"/>
+        <location filename="../libdivecomputer.c" line="496"/>
         <source>Error parsing the samples</source>
         <translation>Грешка при рaзряд на стойности</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="623"/>
+        <location filename="../libdivecomputer.c" line="626"/>
         <source>Event: waiting for user action</source>
         <translation>Събитие: изчаквание на действие от потребителя</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>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="691"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the event handler.</source>
         <translation>Грешка при регистриране на направление за събития</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="696"/>
+        <location filename="../libdivecomputer.c" line="699"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Грешка при регистриране на направление за отменяне</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="717"/>
+        <location filename="../libdivecomputer.c" line="720"/>
         <source>Dive data import error</source>
         <translation>Грешка при вход на данни</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="756"/>
+        <location filename="../libdivecomputer.c" line="759"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Не може да бъде създаден libdivecomputer контекст</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="763"/>
+        <location filename="../libdivecomputer.c" line="766"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Не може да бъдe отворен %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="462"/>
+        <location filename="../parse-xml.c" line="466"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Неразпозната стойност за проценти %s
 </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>Не може да бъде напревен разбор на &apos;%s&apos;</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>Базата данни не може да изпълни get_events.
 </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>Базата данни не може да изпълни get_tags.
@@ -3244,111 +3600,160 @@ Maximum</source>
 </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 '%s'.
 </source>
         <translation>Грешка при заява към база данни &apos;%s&apos;.
 </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>Базата данни не може да изпълни get_cylinders.
 </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>Базата данни не може да изпълни get_changes.
 </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>Базата данни не може да изпълни get_profile_sample.
 </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>Не може да бъде отворен стилов файл %s</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>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="146"/>
-        <location filename="../planner.c" line="617"/>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation>Не може да бъде намерен газ %d/%d</translation>
+        <location filename="../planner.c" line="159"/>
+        <location filename="../planner.c" line="752"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation>Не може да бъде намерен газ %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="308"/>
+        <location filename="../planner.c" line="345"/>
         <source>Too many gas mixes</source>
         <translation>Твърде много газови смеси</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="489"/>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation>%s
-Subsurface планиране
-базирано на GFlow = %.0f и GFhigh = %.0f
-
-</translation>
+        <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>ВНИМАНИЕ: ТОВА Е НОВО ИЗПЪЛНЕНИЕ НА АГЛОРИТЪМА НА БУЛМАН И НА ПЛАНОВИКА, КОИТО НЕ СА ТЕСТВАНИ ДОСТАТЪЧНО. МОЛЯ НЕ ПЛАНУВАЙТЕ ИЗТИНСКИ ГМУРКАНИЯ БАЗИРАНИ НА ДАННИТЕ ТУК!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="530"/>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Преход към %.*f %s за %d:%02d мин - времетраене %d:%02u на %s
-</translation>
+        <location filename="../planner.c" line="535"/>
+        <source>based on GFlow = %d and GFhigh = %d</source>
+        <translation>базирано на GFlow = %d и GFHigh = %d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="539"/>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Остани на %.*f %s за %d:%02d мин - времетраене %d:%02u на %s
-</translation>
+        <location filename="../planner.c" line="538"/>
+        <source>Subsurface dive plan</source>
+        <translation>Subsurface гмуркачески план</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="550"/>
-        <source>Switch gas to %s
-</source>
-        <translation>Превключи газ на %s
-</translation>
+        <location filename="../planner.c" line="542"/>
+        <source>depth</source>
+        <translation>дълбочина</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="558"/>
-        <source>Gas consumption:
-</source>
-        <translation>Консумация на газ:
-</translation>
+        <location filename="../planner.c" line="545"/>
+        <source>runtime</source>
+        <translation>времетраене</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="569"/>
-        <source>%.0f%s of %s
-</source>
-        <translation>%.0f%s от %s
-</translation>
+        <location filename="../planner.c" line="548"/>
+        <source>duration</source>
+        <translation>продължителност</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="551"/>
+        <source>gas</source>
+        <translation>газ</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>Преход към %.*f %s за %d:%02d мин - времетраене %d:%02u на %s</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>Остани на %.*f %s за %d:%02d мин - времетраене %d:%02u на %s</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="606"/>
+        <source>%3.0f%s</source>
+        <translation>%3.0f%s</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
+        <source>%3dmin</source>
+        <translation>%3dмин</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="629"/>
+        <source>Switch gas to %s</source>
+        <translation>Превключи газ на %s</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="638"/>
+        <source>Gas consumption:</source>
+        <translation>Консумация на газ:</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>Предупреждение:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="810"/>
+        <location filename="../planner.c" line="659"/>
+        <source>this is more gas than available in the specified cylinder!</source>
+        <translation>има повече газ от този на разположение в избраната бултилка</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="664"/>
+        <source>not enough reserve for gas sharing on ascent!</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="668"/>
+        <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
+        <translation>%.0f%s (%.0f%s по време на плануваното изкачване) на %s</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="683"/>
+        <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="980"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1226"/>
+        <location filename="../profile.c" line="1250"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3357,70 +3762,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1229"/>
+        <location filename="../profile.c" line="1253"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1233"/>
+        <location filename="../profile.c" line="1257"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1263"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </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>SAC: %2.1fл/мин
+        <translation>SAC: %.*f%s/мин
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1244"/>
+        <location filename="../profile.c" line="1268"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1246"/>
+        <location filename="../profile.c" line="1270"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fбара
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1272"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fбара
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="1274"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fбар
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="1277"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1260"/>
+        <location filename="../profile.c" line="1284"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3429,7 +3834,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1264"/>
+        <location filename="../profile.c" line="1288"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3438,14 +3843,14 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1276"/>
+        <location filename="../profile.c" line="1300"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Стоп: %uмин @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1279"/>
+        <location filename="../profile.c" line="1303"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Стоп: неопр. време @ %.0f%s
@@ -3453,70 +3858,70 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="1308"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %uмин @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
+        <location filename="../profile.c" line="1311"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: неопр. време @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1291"/>
+        <location filename="../profile.c" line="1315"/>
         <source>In deco
 </source>
         <translation>В Deco
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1293"/>
+        <location filename="../profile.c" line="1317"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %uмин
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1297"/>
+        <location filename="../profile.c" line="1321"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %uмин @ %.0f%s (калк.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1305"/>
+        <location filename="../profile.c" line="1329"/>
         <source>In deco (calc)
 </source>
         <translation>В Deco (калк.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1307"/>
+        <location filename="../profile.c" line="1331"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %uмин (калк.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1310"/>
+        <location filename="../profile.c" line="1334"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %uмин (калк.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1313"/>
+        <location filename="../profile.c" line="1337"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Калкулиран таван %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1319"/>
+        <location filename="../profile.c" line="1343"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Тъкан %.0fмин: %.0f%s
@@ -3524,318 +3929,311 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1325"/>
+        <location filename="../profile.c" line="1349"/>
         <source>heartbeat: %d
 </source>
         <translation>пулс: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1327"/>
+        <location filename="../profile.c" line="1351"/>
         <source>bearing: %d
 </source>
         <translation>лагер: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1419"/>
+        <location filename="../profile.c" line="1443"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d мин</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>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1435"/>
+        <location filename="../profile.c" line="1459"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1439"/>
+        <location filename="../profile.c" line="1463"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</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>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1454"/>
+        <location filename="../profile.c" line="1478"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="273"/>
+        <location filename="../qt-gui.cpp" line="281"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="276"/>
+        <location filename="../qt-gui.cpp" line="284"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="392"/>
-        <source>%1, %2 %3, %4 %5:%6</source>
-        <translation>%1, %2 %3, %4 %5:%6</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="405"/>
-        <source>%1 %2, %3
-%4:%5</source>
-        <translation>%1 %2, %3
-%4:%5</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="418"/>
+        <location filename="../qt-gui.cpp" line="417"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 гмуркания)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="423"/>
+        <location filename="../qt-gui.cpp" line="422"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 гмуркане)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>boat</source>
         <translation>кораб</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>shore</source>
         <translation>бряг</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>drift</source>
         <translation>дрейф</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>deep</source>
         <translation>дълбоко</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>cavern</source>
         <translation>каверна</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>ice</source>
         <translation>лед</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>wreck</source>
         <translation>останки</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>cave</source>
         <translation>пещера</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>altitude</source>
         <translation>височина</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>pool</source>
         <translation>басейн</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>lake</source>
         <translation>езеро</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>river</source>
         <translation>река</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>night</source>
         <translation>вечер</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>fresh</source>
         <translation>нов</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>student</source>
         <translation>студент</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>photo</source>
         <translation>снимка</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>video</source>
         <translation>видео</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>instructor</source>
         <translation>инструктор</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="25"/>
         <source>deco</source>
         <translation>деко</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="216"/>
+        <location filename="../dive.c" line="133"/>
+        <source>ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="214"/>
         <source>more than %d days</source>
         <translation>повече от %d дни</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="220"/>
         <source>%dd %dh %dmin</source>
         <translation>%dд %dч %dмин</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="224"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dh %dmin</source>
         <translation>%dч %dмин</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="235"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation>за гмуркания №</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="242"/>
+        <location filename="../statistics.c" line="240"/>
         <source>for selected dives</source>
         <translation>за избраните гмуркания</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="275"/>
         <source>for dive #%d</source>
         <translation>за гмуркане №%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for selected dive</source>
         <translation>за избраните гмуркане</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for all dives</source>
         <translation>за вички гмуркания</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="283"/>
+        <location filename="../statistics.c" line="281"/>
         <source>(no dives)</source>
         <translation>(няма гмуркания)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sun</source>
         <translation>Нед</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Mon</source>
         <translation>Пон</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Tue</source>
         <translation>Вт</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Wed</source>
         <translation>Ср</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Thu</source>
         <translation>Чет</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Fri</source>
         <translation>Пет</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sat</source>
         <translation>Съб</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jan</source>
         <translation>Ян</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Feb</source>
         <translation>Фев</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Mar</source>
         <translation>Март</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Apr</source>
         <translation>Апр</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>May</source>
         <translation>Май</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jun</source>
         <translation>Юни</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Jul</source>
         <translation>Юли</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Aug</source>
         <translation>Авг</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Sep</source>
         <translation>Сеп</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Oct</source>
         <translation>Окт</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Nov</source>
         <translation>Нов</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Dec</source>
         <translation>Дек</translation>
     </message>
@@ -3865,97 +4263,97 @@ Is the Uemis Zurich plugged in correctly?</source>
 Uemis Zurich включен ли е правилно?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="107"/>
+        <location filename="../uemis-downloader.c" line="111"/>
         <source>unknown</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="379"/>
+        <location filename="../uemis-downloader.c" line="383"/>
         <source>Reading %s %s</source>
         <translation>Четене на гмуркане %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="399"/>
+        <location filename="../uemis-downloader.c" line="403"/>
         <source>data</source>
         <translation>данни</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="420"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>divelog entry id</source>
         <translation>идент. за вписване в регистъра</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="422"/>
+        <location filename="../uemis-downloader.c" line="426"/>
         <source>divespot data id</source>
         <translation>идент. за вписване на местонахождение</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
+        <location filename="../uemis-downloader.c" line="428"/>
         <source>more data dive id</source>
         <translation>повече данни за гмуркане</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>wetsuit</source>
         <translation>мокър костюм</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>semidry</source>
         <translation>полусух</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>drysuit</source>
         <translation>сух костюм</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>shorty</source>
         <translation>къс</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>vest</source>
         <translation>жилетка</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>long john</source>
         <translation>лонг джон</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>jacket</source>
         <translation>яке</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>full suit</source>
         <translation>пълен косюм</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>2 pcs full suit</source>
         <translation>2 за цял костюм</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="620"/>
+        <location filename="../uemis-downloader.c" line="624"/>
         <source>membrane</source>
         <translation>мембрана</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="802"/>
+        <location filename="../uemis-downloader.c" line="823"/>
         <source>Init Communication</source>
         <translation>Започни връзка</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="804"/>
+        <location filename="../uemis-downloader.c" line="825"/>
         <source>Uemis init failed</source>
         <translation>Uemis не може да бъде зареден</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="815"/>
+        <location filename="../uemis-downloader.c" line="836"/>
         <source>Start download</source>
         <translation>Започни теглене</translation>
     </message>
@@ -3976,18 +4374,18 @@ Uemis Zurich включен ли е правилно?</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="203"/>
-        <source>PO2 Green Warning</source>
-        <translation>Внимание: парциално О2 налягане в зелената зона</translation>
+        <source>pO₂ Green Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
-        <source>PO2 Ascend Warning</source>
-        <translation>Внимание: покачване на парциално О2 налягане</translation>
+        <source>pO₂ Ascend Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="208"/>
-        <source>PO2 Ascend Alarm</source>
-        <translation>Тревога: покачване на парциално О2 налягане</translation>
+        <source>pO₂ Ascend Alarm</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
@@ -4049,5 +4447,214 @@ Uemis Zurich включен ли е правилно?</translation>
         <source>Low Battery Alert</source>
         <translation>Тревога: слаба батерия</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>Не може да бъде отворен файл %s</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="36"/>
+        <source>Date:</source>
+        <translation>Дата:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="38"/>
+        <source>Time:</source>
+        <translation>Време:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="40"/>
+        <source>Duration:</source>
+        <translation>Продължителност:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="41"/>
+        <source>min</source>
+        <translation>мин</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="43"/>
+        <source>Max Depth:</source>
+        <translation>Макс. дълбочина</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="46"/>
+        <source>Air Temp:</source>
+        <translation>Темп. на въздух:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="48"/>
+        <source>Water Temp:</source>
+        <translation>Темп. на водата:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="50"/>
+        <source>Location:</source>
+        <translation>Местонахождение:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="54"/>
+        <source>Notes:</source>
+        <translation>Бележки:</translation>
+    </message>
+</context>
+<context>
+    <name>plannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="14"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="35"/>
+        <source>Rates</source>
+        <translation>Рейтинг</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="56"/>
+        <source>Ascent</source>
+        <translation>Изкачване</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="77"/>
+        <source>below 75% avg. depth</source>
+        <translation>Под 75% средна дълбочина</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>м/мин</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="94"/>
+        <source>75%-50% avg. depth</source>
+        <translation>75%-50% средна дълбочина</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="111"/>
+        <source>50% avg. depth - 6m/20ft</source>
+        <translation>50% средна дълбочина - 6м/20фута</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="128"/>
+        <source>6m/20ft to surface</source>
+        <translation>6м/20фута до повърхността</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="148"/>
+        <source>Descent</source>
+        <translation>Спускане</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="200"/>
+        <source>surface to the bottom</source>
+        <translation>Повърхност до дъно</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="226"/>
+        <source>Planning</source>
+        <translation>Планиране</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="247"/>
+        <source>GF low</source>
+        <translation>GF low</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="264"/>
+        <source>GF high</source>
+        <translation>GF high</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
+        <source>Drop to first depth</source>
+        <translation>Спускане до първа дълбочина</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
+        <source>Last Stop at 6m/20ft</source>
+        <translation>Последен стоп на 6м/20фута</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>plan backgas breaks</source>
+        <translation>Планирай &quot;бекгас брейкс&quot;</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="318"/>
+        <source>Gas Options</source>
+        <translation>Газ настройки</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <source>bottom SAC</source>
+        <translation>долен SAC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="349"/>
+        <source>deco SAC</source>
+        <translation>деко SAC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="359"/>
+        <source>bottom pO₂</source>
+        <translation>долен pO₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="389"/>
+        <source>bar</source>
+        <translation>бара</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="382"/>
+        <source>deco pO₂</source>
+        <translation>деко pO₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="421"/>
+        <source>Dive Notes</source>
+        <translation>Бележки</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+        <source>In dive plan, show runtime (absolute time) of stops</source>
+        <translation>Покажи времетраене (абсолютно време) на стоповете в гмуркаческия план</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="445"/>
+        <source>display runtime</source>
+        <translation>Покажи времетраене</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="458"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
+        <translation>Покажи времетраене (oтносително време) на стоповете в гмуркаческия план</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="461"/>
+        <source>display segment duration</source>
+        <translation>Покажи времетраене на сегментацията</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="471"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
+        <translation>Покажи преводи или ги третирай като косвени в гмуркаческия план</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="474"/>
+        <source>display transitions in deco</source>
+        <translation>Покажи транзиции в декомпресията</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="481"/>
+        <source>verbatim diveplan</source>
+        <translation>Дословен гмуркачески план</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_da_DK.ts b/translations/subsurface_da_DK.ts
index 51afcf99b..32b2478a7 100644
--- a/translations/subsurface_da_DK.ts
+++ b/translations/subsurface_da_DK.ts
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="da_DK">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="da_DK" version="2.0">
+<defaultcodec>UTF-8</defaultcodec>
 <context>
     <name>CylindersModel</name>
     <message>
@@ -39,42 +38,42 @@
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="71"/>
+        <location filename="../qt-ui/models.cpp" line="70"/>
         <source>Switch at</source>
         <translation>Skift ved</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>Klik her vil fjerne flasken</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>Flasken kan ikke fjernes</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>Denne flaske er i brug. Kun flasker som ikke er i brug kan slettes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="507"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="508"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="527"/>
+        <location filename="../qt-ui/models.cpp" line="532"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="528"/>
+        <location filename="../qt-ui/models.cpp" line="533"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -102,22 +101,22 @@ fjerne den valgte dykkercomputer?</translation>
 <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>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Device ID</source>
         <translation>Enheds ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Nickname</source>
         <translation>Kaldenavn</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>Klik her, vil fjerne denne dykkercomputer</translation>
     </message>
@@ -125,190 +124,326 @@ fjerne den valgte dykkercomputer?</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="90"/>
-        <source>air</source>
-        <translation>luft</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="92"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</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>BailOut til OC</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>start</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>slut</translation>
     </message>
 </context>
 <context>
-    <name>DiveGasPressureItem</name>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="475"/>
-        <source>air</source>
-        <translation>luft</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="476"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-</context>
-<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1258"/>
-        <source> l/min</source>
-        <translation>l/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
-        <source> cuft/min</source>
-        <translation> cuft/min</translation>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <source>/min</source>
+        <translation>/min</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>Vis søgebox</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="706"/>
         <source>expand all</source>
         <translation>Vis alt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="740"/>
+        <location filename="../qt-ui/divelistview.cpp" line="707"/>
         <source>collapse all</source>
         <translation>Skjul alt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="741"/>
+        <location filename="../qt-ui/divelistview.cpp" line="708"/>
         <source>collapse others</source>
         <translation>Saml andre</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>Fjern dyk fra tur</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>Opret ny tur over</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>Tilføj dyk til tur umiddelbart over</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>Tilføj dyk til turen umiddelbart under</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>Flet tur med ovenstående</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>Flet tur med efterstående</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>Slet dyk</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>Marker dyk som ugyldig(e)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
-        <source>save As</source>
-        <translation>Gem som</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="763"/>
-        <source>export As UDDF</source>
-        <translation>Exporter som UDDF</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="764"/>
-        <source>export As CSV</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/divelistview.cpp" line="744"/>
+        <source>renumber dive(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="765"/>
+        <location filename="../qt-ui/divelistview.cpp" line="745"/>
         <source>shift times</source>
         <translation>Skift tider</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="766"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>load images</source>
         <translation>Vis billeder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="769"/>
-        <source>upload dive(s) to divelogs.de</source>
-        <translation>Upload dyk til divelogs.de</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Open Image Files</source>
+        <translation>Åben billed filer</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation>Billed filer  (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <source>merge selected dives</source>
+        <translation>Flet valgte dyk</translation>
+    </message>
+</context>
+<context>
+    <name>DiveLogExportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
+        <source>Export Dive Log Files</source>
+        <translation>Eksporter dyk filerne</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="24"/>
+        <source>General Export</source>
+        <translation>General eksport</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="30"/>
+        <source>Export format</source>
+        <translation>Eksporter format</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="42"/>
+        <source>Subsurface XML</source>
+        <translation>Subsurface XML</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="61"/>
+        <source>UDDF</source>
+        <translation>UDDF</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="74"/>
+        <source>divelogs.de</source>
+        <translation>divelogs.de</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="84"/>
+        <source>CSV</source>
+        <translation>CSV</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="94"/>
+        <source>Worldmap</source>
+        <translation>Globalt kort</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="107"/>
+        <source>Selection</source>
+        <translation>Valg</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="116"/>
+        <source>Selected dives</source>
+        <translation>Valgte dyk</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="126"/>
+        <source>All dives</source>
+        <translation>Alle dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="795"/>
-        <source>Save Dives As...</source>
-        <translation>Gem dyk som...</translation>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="178"/>
+        <source>HTML</source>
+        <translation>HTML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="814"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="184"/>
+        <source>General Settings</source>
+        <translation>Indstillinger</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="190"/>
+        <source>Subsurface Numbers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="203"/>
+        <source>Selected Dives</source>
+        <translation>Valgte dyk</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="216"/>
+        <source>Minimum Javascript</source>
+        <translation>Minimum javascript</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="229"/>
+        <source>All Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="239"/>
+        <source>Export List only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="252"/>
+        <source>Style Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="264"/>
+        <source>Font</source>
+        <translation>Font</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="274"/>
+        <source>Font size</source>
+        <translation>Font størrelse</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
+        <source>8</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <source>10</source>
+        <translation>10</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <source>12</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <source>14</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <source>16</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <source>18</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <source>20</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="323"/>
+        <source>Theme</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <source>Sand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="153"/>
         <source>Export UDDF File as</source>
-        <translation type="unfinished"></translation>
+        <translation>Eksporter UDDF fil som</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>UDDF filer (*.uddf *.UDDF)</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>
+        <translation>Eksporter CSV fil som</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>
+        <translation>CSV filer (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Open Image Files</source>
-        <translation>Åben billed filer</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="162"/>
+        <source>Export World Map</source>
+        <translation>Eksporter verdenskort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
-        <translation>Billed filer  (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="163"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="177"/>
+        <source>HTML files (*.html)</source>
+        <translation>HTML filer (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="760"/>
-        <source>merge selected dives</source>
-        <translation>Flet valgte dyk</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="167"/>
+        <source>Export Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="168"/>
+        <source>XML files (*.xml *.ssrf)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="176"/>
+        <source>Export HTML files as</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -319,138 +454,133 @@ fjerne den valgte dykkercomputer?</translation>
         <translation>Importer dykkerlog</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="36"/>
-        <source>Import CSV Dive Log Files</source>
-        <translation>Importer CSV dykkerlog</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="50"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
         <source>CSV options</source>
         <translation>CSV muligheder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="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>Felt separator</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>Pre-konfigurerede imports</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>Felt konfiguration</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="80"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="100"/>
         <source>Stopdepth</source>
         <translation>Stop dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="107"/>
         <source>PO2</source>
         <translation>PO2</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>Tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="121"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="151"/>
         <source>Cns</source>
         <translation>Cns</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>Enheder</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>Metrisk</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>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="248"/>
         <source>Manual dives</source>
         <translation>Manuelle dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="283"/>
         <source>Dive #</source>
         <translation>Dyk #</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="317"/>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="385"/>
         <source>Duration</source>
         <translation>Varighed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="470"/>
         <source>Tags</source>
         <translation>Tags</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
         <source>Location</source>
         <translation>Lokation</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="453"/>
         <source>Gps</source>
         <translation>Gps</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="300"/>
         <source>Max depth</source>
         <translation>Max dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="334"/>
         <source>Mean depth</source>
         <translation>Gnm dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="368"/>
         <source>Buddy</source>
         <translation>Makker</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="402"/>
         <source>Notes</source>
         <translation>Noter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="436"/>
         <source>Weight</source>
         <translation>Vægt</translation>
     </message>
@@ -458,105 +588,70 @@ fjerne den valgte dykkercomputer?</translation>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="71"/>
-        <source>Bottom SAC</source>
-        <translation>Bund SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="85"/>
-        <source>SAC on DECO Stop</source>
-        <translation>SAC på Deco stop</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="106"/>
+        <source>Planned Dive Time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="78"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="134"/>
+        <source>Altitude</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="98"/>
-        <source>GFLow</source>
-        <translation>GFlow</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="125"/>
-        <source>Last Stop at 6m</source>
-        <translation>Sidste stop på 6m</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="174"/>
-        <source>Start Time</source>
-        <translation>Start tid</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="181"/>
+        <location filename="../qt-ui/diveplanner.ui" line="141"/>
         <source>ATM Pressure</source>
         <translation>ATM Tryk</translation>
     </message>
-</context>
-<context>
-    <name>DivePlannerGraphics</name>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="114"/>
-        <source>10m</source>
-        <translation>10m</translation>
-    </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="116"/>
-        <source>30ft</source>
-        <translation>30ft</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="148"/>
+        <source>mbar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="363"/>
-        <source>Handler Position Error</source>
-        <translation>Handler Position Error</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>
-        <translation>Et eller flere af dine stop vil gå tabt ved denne handling,
-slet dem venligst først.</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="158"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="445"/>
-        <source>AIR</source>
-        <translation>LUFT</translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="137"/>
+        <source>unknown</source>
+        <translation>Ukendt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1148"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="586"/>
         <source>Final Depth</source>
         <translation>Slut Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1150"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="588"/>
         <source>Run time</source>
         <translation>Run time</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1152"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="590"/>
         <source>Duration</source>
         <translation>Varighed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1154"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="592"/>
         <source>Used Gas</source>
         <translation>Brugt Gas</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>CC Set Punkt</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> Kassér Planen?</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>Du er ved kassére din plan.</translation>
     </message>
@@ -564,17 +659,17 @@ slet dem venligst først.</translation>
 <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>Dive Planner Point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="256"/>
         <source>Available Gases</source>
         <translation>Gasser tilrådighed</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>Tilføj dykker data point</translation>
     </message>
@@ -618,8 +713,23 @@ slet dem venligst først.</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
-        <source>Pressure  S</source>
-        <translation>Tryk S</translation>
+        <source>Pressure S</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <source>pN₂</source>
+        <translation>pN₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>pHe</source>
+        <translation>pHe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
@@ -636,86 +746,71 @@ slet dem venligst først.</translation>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
-        <source>PN2</source>
-        <translation>PN2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
-        <source>PHE</source>
-        <translation>PHE</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
-        <source>PO2</source>
-        <translation>PO2</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>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>ft</source>
         <translation>fod</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1298"/>
         <source>min</source>
         <translation>min.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
+        <location filename="../qt-ui/models.cpp" line="1307"/>
         <source>suit</source>
         <translation>Dragt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1310"/>
         <source>cyl</source>
         <translation>Flaske</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1344"/>
+        <location filename="../qt-ui/models.cpp" line="1325"/>
         <source>location</source>
         <translation>Sted</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1316"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1338"/>
+        <location filename="../qt-ui/models.cpp" line="1319"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1341"/>
+        <location filename="../qt-ui/models.cpp" line="1322"/>
         <source>maxCNS</source>
         <translation>MaxCNS</translation>
     </message>
@@ -723,115 +818,115 @@ slet dem venligst først.</translation>
 <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>Ugyldigt svar fra serveren</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>Forventet XML tag &apos;DiveDateReader&apos;, fik istedet &apos;%1</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>Forventet XML tag &apos;DiveDates&apos; ikke fundet</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>Ugyldig XML svar. Linje %1: %2</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>ingen dyk var valgt</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>Kunne ikke danne zip fil til upload: %s</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>Kan ikke danne midlertidig fil: %s</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>Intern fejl: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="181"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="179"/>
         <source>internal error</source>
         <translation>Intern fejl</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>Færdig</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>Uploader dyk liste...</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>Downloader dyk liste...</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>Downloader %1 dyk...</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>Download færdig - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
         <source>Corrupted download</source>
         <translation>Fejl i download</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>Arkivet kunne i åbnes:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Upload failed</source>
         <translation>Upload fejlede</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="849"/>
         <source>Upload successful</source>
         <translation>Uploadet med succes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="854"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="852"/>
         <source>Login failed</source>
         <translation>Login fejlede</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>Kan ikke fortolke svar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="868"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Error: %1</source>
         <translation>Fejl: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="835"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/>
         <source>Upload finished</source>
         <translation>Upload færdig</translation>
     </message>
@@ -839,54 +934,54 @@ slet dem venligst først.</translation>
 <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>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="165"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/>
         <source>Error</source>
         <translation>Fejl</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>Prøv igen</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>Find Uemis dykker computer</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>Vælg logfil for computer download</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>Logfiler (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="339"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
         <source>Warning</source>
         <translation>Advarsel</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>Gem af libdivecomputer dump vil IKKE downloade dyk til listen</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>Vælg fil for dykkercomputerens binære dump fil</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>Dump filer (*.bin)</translation>
     </message>
@@ -954,7 +1049,7 @@ slet dem venligst først.</translation>
 <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>Rediger valgte dykker steder</translation>
     </message>
@@ -963,848 +1058,854 @@ slet dem venligst først.</translation>
     <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>Dyk Noter</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>Position</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="148"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Coordinates</source>
         <translation>Koordinater</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="169"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="155"/>
+        <location filename="../qt-ui/maintab.ui" line="148"/>
         <source>Buddy</source>
         <translation>Makker</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="63"/>
-        <source>Start time</source>
-        <translation>Start tid</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>Luft temp</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>Vand temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="127"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Tags</source>
         <translation>Tags</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="223"/>
         <source>Rating</source>
         <translation>Bedømmelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="236"/>
         <source>Visibility</source>
         <translation>Sigtbarhed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="215"/>
+        <location filename="../qt-ui/maintab.ui" line="127"/>
         <source>Suit</source>
         <translation>Dragt</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>Noter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="270"/>
+        <location filename="../qt-ui/maintab.ui" line="311"/>
         <source>Equipment</source>
         <translation>Udstyr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="350"/>
+        <location filename="../qt-ui/maintab.ui" line="391"/>
         <source>Dive Info</source>
         <translation>Dyk info</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>Dato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="414"/>
+        <location filename="../qt-ui/maintab.ui" line="275"/>
+        <source>Time</source>
+        <translation>Tid</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="455"/>
         <source>Interval</source>
         <translation>Interval</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="433"/>
+        <location filename="../qt-ui/maintab.ui" line="474"/>
         <source>Gases Used</source>
         <translation>Anvendte gasser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="452"/>
+        <location filename="../qt-ui/maintab.ui" line="493"/>
         <source>Gas Consumed</source>
         <translation>Forbrugt Gas</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>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="531"/>
         <source>Max. Depth</source>
         <translation>Max dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="509"/>
+        <location filename="../qt-ui/maintab.ui" line="550"/>
         <source>Ave. Depth</source>
         <translation>Gns. dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="528"/>
+        <location filename="../qt-ui/maintab.ui" line="569"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="547"/>
+        <location filename="../qt-ui/maintab.ui" line="588"/>
         <source>Air Pressure</source>
         <translation>Lufttryk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="566"/>
+        <location filename="../qt-ui/maintab.ui" line="607"/>
         <source>Air Temperature</source>
         <translation>Luft temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="585"/>
+        <location filename="../qt-ui/maintab.ui" line="626"/>
         <source>Water Temperature</source>
         <translation>Vand temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="604"/>
+        <location filename="../qt-ui/maintab.ui" line="645"/>
         <source>Dive Time</source>
         <translation>Dykker Tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="623"/>
+        <location filename="../qt-ui/maintab.ui" line="664"/>
         <source>Salinity</source>
         <translation>Saltindhold</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="660"/>
+        <location filename="../qt-ui/maintab.ui" line="701"/>
         <source>Stats</source>
         <translation>Statistik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="746"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="784"/>
         <source>Duration</source>
         <translation>Varighed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Total Time</source>
         <translation>Total tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="835"/>
         <source>Dives</source>
         <translation>Dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
+        <source>Gas Consumption</source>
+        <translation>Gas forbrug</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="919"/>
+        <source>Photos</source>
+        <translation>Fotos</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="89"/>
         <source>Cylinders</source>
         <translation>Flasker </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="90"/>
         <source>Add Cylinder</source>
         <translation>Tilføj flaske</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="93"/>
         <source>Weights</source>
         <translation>Vægt</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>Tilføj vægt system</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="438"/>
+        <location filename="../qt-ui/maintab.cpp" line="409"/>
         <source>Trip Location</source>
         <translation>Tur position</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>Tur noter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="42"/>
+        <location filename="../qt-ui/maintab.cpp" line="48"/>
         <source>Save</source>
         <translation>Gem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="46"/>
+        <location filename="../qt-ui/maintab.cpp" line="52"/>
         <source>Cancel</source>
         <translation>Fortryd</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>Luft temp [%1]</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>Vand temp [%1]</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>Turen er ved at blive rettet.</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>Flere dyk bliver rettet.</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>Dette dyk bliver rettet.</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>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="494"/>
+        <location filename="../qt-ui/maintab.cpp" line="464"/>
         <source>unknown</source>
         <translation>Ukendt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>N</source>
-        <translation>N</translation>
+        <location filename="../qt-ui/maintab.cpp" line="501"/>
+        <source>Deepest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>S</source>
-        <translation>S</translation>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <source>Shallowest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>E</source>
-        <translation>Ø</translation>
+        <location filename="../qt-ui/maintab.cpp" line="794"/>
+        <source>Discard the Changes?</source>
+        <translation>Glem ændringer?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>W</source>
-        <translation>V</translation>
+        <location filename="../qt-ui/maintab.cpp" line="795"/>
+        <source>You are about to discard your changes.</source>
+        <translation type="unfinished"/>
     </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>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="571"/>
+        <location filename="../qt-ui/mainwindow.ui" line="646"/>
         <source>&amp;File</source>
         <translation>&amp;Fil</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="583"/>
+        <source>Print</source>
+        <translation>Udskriv:</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:'Courier'; 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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="606"/>
+        <location filename="../qt-ui/mainwindow.ui" line="679"/>
         <source>&amp;View</source>
         <translation>&amp;Vis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="628"/>
+        <location filename="../qt-ui/mainwindow.ui" line="701"/>
         <source>&amp;Help</source>
         <translation>&amp;Hjælp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="636"/>
+        <location filename="../qt-ui/mainwindow.ui" line="709"/>
         <source>&amp;Import</source>
         <translation>&amp;Importer</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>&amp;Ny logbog</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="655"/>
+        <location filename="../qt-ui/mainwindow.ui" line="728"/>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="658"/>
+        <location filename="../qt-ui/mainwindow.ui" line="731"/>
         <source>Ctrl+N</source>
         <translation>Crtl-N</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>&amp;Åben logbog</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="666"/>
+        <location filename="../qt-ui/mainwindow.ui" line="739"/>
         <source>Open</source>
         <translation>Åben</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <location filename="../qt-ui/mainwindow.ui" line="742"/>
         <source>Ctrl+O</source>
         <translation>Crtl-O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="674"/>
+        <location filename="../qt-ui/mainwindow.ui" line="747"/>
         <source>&amp;Save</source>
         <translation>&amp;Gem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="677"/>
+        <location filename="../qt-ui/mainwindow.ui" line="750"/>
         <source>Save</source>
         <translation>Gem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="680"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Ctrl+S</source>
         <translation>Crtl+S</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>Save as</source>
         <translation>Gem som</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>Ctrl+Shift+S</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>&amp;Luk</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Close</source>
         <translation>Luk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="702"/>
+        <location filename="../qt-ui/mainwindow.ui" line="775"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="902"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <source>P&amp;references</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="831"/>
+        <source>&amp;Add Dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <source>Auto &amp;Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="863"/>
+        <source>&amp;Dive List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="871"/>
+        <source>&amp;Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="879"/>
+        <source>&amp;Info</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="887"/>
+        <source>&amp;All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="895"/>
+        <source>P&amp;rev DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="903"/>
+        <source>&amp;Next DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="911"/>
+        <source>&amp;Select Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <source>&amp;About Subsurface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="937"/>
+        <source>&amp;Globe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="953"/>
+        <source>&amp;Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="959"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="707"/>
-        <source>Export &amp;UDDF</source>
-        <translation>Export &amp;UDDF</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="1008"/>
+        <source>&amp;Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1011"/>
+        <source>Export Dive Logs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1014"/>
+        <source>Ctrl+E</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Enable the pN2 Graph</source>
         <translation>Vis pN2 graf</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <location filename="../qt-ui/mainwindow.ui" line="128"/>
         <source>Enable the pHe graph</source>
         <translation>Vis pHe graf</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <location filename="../qt-ui/mainwindow.ui" line="290"/>
         <source>Show/hide heart rate</source>
         <translation>Vis/skjul puls</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <location filename="../qt-ui/mainwindow.ui" line="342"/>
         <source>Enable EAD, END, and EADD</source>
         <translation>Vis EAD, END, og EADD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="238"/>
         <source>Show NDL / TTS</source>
         <translation>Vis NDL / TTS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="456"/>
+        <location filename="../qt-ui/mainwindow.ui" line="394"/>
         <source>Rescale depth axis</source>
         <translation>Skaler dybde aksen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="710"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="715"/>
-        <source>Export HTML World Map</source>
-        <translation>Eksporter HTML verdenskort</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="718"/>
-        <source>Ctrl+H</source>
-        <translation>Ctrl+H</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="723"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>&amp;Print</source>
         <translation>&amp;Print</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="734"/>
+        <location filename="../qt-ui/mainwindow.ui" line="791"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="742"/>
+        <location filename="../qt-ui/mainwindow.ui" line="799"/>
         <source>&amp;Quit</source>
         <translation>&amp;Afslut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="753"/>
+        <location filename="../qt-ui/mainwindow.ui" line="810"/>
         <source>Import from &amp;dive computer</source>
         <translation>Importer fra &amp;dive computer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="818"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation>Importer GPS data fra Subsurface WeBServices</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="764"/>
+        <location filename="../qt-ui/mainwindow.ui" line="821"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="826"/>
         <source>&amp;Edit Device Names</source>
         <translation>&amp;Edit Enheds navne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="834"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="782"/>
+        <location filename="../qt-ui/mainwindow.ui" line="839"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Re-Nummerer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="785"/>
+        <location filename="../qt-ui/mainwindow.ui" line="842"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="798"/>
+        <location filename="../qt-ui/mainwindow.ui" line="855"/>
         <source>&amp;Yearly Statistics</source>
         <translation>&amp;Årlig Statistik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="801"/>
+        <location filename="../qt-ui/mainwindow.ui" line="858"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="806"/>
-        <source>Dive List</source>
-        <translation>Liste</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="814"/>
-        <source>Profile</source>
-        <translation>Profil</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="822"/>
-        <source>Info</source>
-        <translation>Info</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="830"/>
-        <source>All</source>
-        <translation>Alt</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="872"/>
+        <location filename="../qt-ui/mainwindow.ui" line="929"/>
         <source>User &amp;Manual</source>
         <translation>Bruger &amp;Manual</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="880"/>
-        <source>Globe</source>
-        <translation>Globus</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="888"/>
+        <location filename="../qt-ui/mainwindow.ui" line="945"/>
         <source>P&amp;lan Dive</source>
         <translation>P&amp;lan Dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="891"/>
+        <location filename="../qt-ui/mainwindow.ui" line="948"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="907"/>
-        <source>Import from Divelogs.de</source>
-        <translation>Importer fra Divelog.de</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1003"/>
         <source>&amp;Check for Updates</source>
-        <translation>%Tjek for opdateringer</translation>
+        <translation>&amp;Tjek for opdateringer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="951"/>
-        <source>Export CSV</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="726"/>
+        <location filename="../qt-ui/mainwindow.ui" line="783"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</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>Vis pO2 Graf</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>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="316"/>
         <source>Enable MOD</source>
         <translation>Vis MOD</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>Vis computeres loft</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>Vis beregnet loft</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>Vis beregnet loft med 3m interval</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>Beregn alle væv</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>Vis SAC rate</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>Vis / skjul linealen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="731"/>
-        <source>Preferences</source>
-        <translation>Indstillinger</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="745"/>
+        <location filename="../qt-ui/mainwindow.ui" line="802"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="756"/>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="774"/>
-        <source>Add Dive</source>
-        <translation>Tilføj Dyk</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="793"/>
-        <source>Auto Group</source>
-        <translation>Auto Gruppering</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="809"/>
+        <location filename="../qt-ui/mainwindow.ui" line="866"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="817"/>
+        <location filename="../qt-ui/mainwindow.ui" line="874"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <location filename="../qt-ui/mainwindow.ui" line="882"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="833"/>
+        <location filename="../qt-ui/mainwindow.ui" line="890"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="838"/>
-        <source>Prev DC</source>
-        <translation>Forrige DC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="841"/>
+        <location filename="../qt-ui/mainwindow.ui" line="898"/>
         <source>Left</source>
         <translation>Venstre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="846"/>
-        <source>Next DC</source>
-        <translation>Næste DC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="849"/>
+        <location filename="../qt-ui/mainwindow.ui" line="906"/>
         <source>Right</source>
         <translation>Højre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="854"/>
-        <source>Select Events</source>
-        <translation>Vælg hændelser</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <location filename="../qt-ui/mainwindow.ui" line="916"/>
         <source>Input Plan</source>
         <translation>Input Plan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="864"/>
-        <source>About Subsurface</source>
-        <translation>Om Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="875"/>
+        <location filename="../qt-ui/mainwindow.ui" line="932"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="883"/>
+        <location filename="../qt-ui/mainwindow.ui" line="940"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="896"/>
-        <source>Import Log Files</source>
-        <translation>Importer log filer</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="899"/>
+        <location filename="../qt-ui/mainwindow.ui" line="956"/>
         <source>Import divelog files from other applications</source>
         <translation>Importer dykkerlog fra andre programmer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="915"/>
+        <location filename="../qt-ui/mainwindow.ui" line="964"/>
+        <source>Import &amp;from Divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="972"/>
         <source>&amp;Full Screen</source>
         <translation>&amp;Fuld Skærm</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>Skift Fuld Skærm</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <location filename="../qt-ui/mainwindow.ui" line="978"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="174"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
         <source>Open File</source>
         <translation>Åben fil</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>Gem eller fortryd venligst denne rettelse før du lukker filen</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>
-        <translation>Gem eller fortryd venligst dette dyk før du laver en dykkerplan</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="396"/>
+        <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>Gem eller fortryd venligst dette dyk før du tilføjer et dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="645"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="419"/>
+        <source>Print runtime table</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="710"/>
         <source>Do you want to save the changes you made in the file %1?</source>
         <translation>Vil du gemme ændringerne du lavede i filen %1?</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>Vil du gemme ændringerne du lavede i filen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="652"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="717"/>
         <source>Save Changes?</source>
         <translation>Gem ændringer?</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>Ændringer vil blive tabt hvis du ikke gemmer dem.</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>Gem fil som</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>Advarsel</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>Gem eller fortryd venligst det aktuelle dyk før du åbner en ny fil</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>UDDF filer (*.uddf *.UDDF)</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>
-        <translation>Eksporter verdenskort</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="300"/>
-        <source>HTML files (*.html)</source>
-        <translation>HTML filer (*.html)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="449"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="514"/>
         <source>Yearly Statistics</source>
         <translation>Årlig Statistik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="961"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1076"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML filer (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1199"/>
         <source>Open Dive Log File</source>
         <translation>Åben dykker log fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <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>Dykker log filer (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML Filer (*.xml);;UDDF/UDCF Filer(*.uddf *.udcf);;JDive Log Filer(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;Alle Filer(*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1225"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Færdiggør denne rettelse inden du starter på en ny.</translation>
     </message>
 </context>
 <context>
+    <name>PlannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Last stop at 20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="416"/>
+        <source>Last stop at 6m</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>PreferencesDialog</name>
     <message>
         <location filename="../qt-ui/preferences.ui" line="85"/>
@@ -1827,247 +1928,297 @@ slet dem venligst først.</translation>
         <translation>Sprog</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="151"/>
         <source>Lists and Tables</source>
         <translation>Lister og tabeller</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="167"/>
         <source>Font size</source>
         <translation>Font størrelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="170"/>
+        <location filename="../qt-ui/preferences.ui" line="180"/>
         <source>Dives</source>
         <translation>Dyk</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>Standard dyk fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="188"/>
+        <location filename="../qt-ui/preferences.ui" line="198"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="197"/>
+        <location filename="../qt-ui/preferences.ui" line="207"/>
         <source>Display Invalid</source>
         <translation>Ugyldig visning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="214"/>
+        <location filename="../qt-ui/preferences.ui" line="224"/>
         <source>Default Cylinder</source>
         <translation>Standard flaske</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>Brug standard flaske</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <location filename="../qt-ui/preferences.ui" line="247"/>
         <source>Animations</source>
         <translation>Animationer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <location filename="../qt-ui/preferences.ui" line="253"/>
         <source>Speed</source>
         <translation>Hastighed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="270"/>
+        <location filename="../qt-ui/preferences.ui" line="280"/>
         <source>Subsurface Webservice</source>
         <translation>Subsurface Webservice</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>Standard Bruger ID</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>Gem bruger ID lokalt?</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="312"/>
+        <source>Reset all settings to their default value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="348"/>
         <source>Metric</source>
         <translation>Metrisk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="333"/>
+        <location filename="../qt-ui/preferences.ui" line="358"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="343"/>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
         <source>Personalize</source>
         <translation>Personliggør</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="392"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="374"/>
+        <location filename="../qt-ui/preferences.ui" line="399"/>
         <source>meter</source>
         <translation>meter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="409"/>
         <source>feet</source>
         <translation>fod</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="401"/>
+        <location filename="../qt-ui/preferences.ui" line="426"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="411"/>
+        <location filename="../qt-ui/preferences.ui" line="436"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="428"/>
+        <location filename="../qt-ui/preferences.ui" line="453"/>
         <source>liter</source>
         <translation>liter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="438"/>
+        <location filename="../qt-ui/preferences.ui" line="463"/>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="455"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="465"/>
+        <location filename="../qt-ui/preferences.ui" line="490"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="482"/>
+        <location filename="../qt-ui/preferences.ui" line="507"/>
         <source>kg</source>
         <translation>kg</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>Grænse ved visning af pO2</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>Grænse ved visning af pN2</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>Grænse ved visning af pHe</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="636"/>
-        <source>max ppO₂ when showing MOD</source>
-        <translation>max ppO2 ved visning af MOD</translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="811"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="817"/>
+        <source>Proxy type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="830"/>
+        <source>Host</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="856"/>
+        <source>Port</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="882"/>
+        <source>Requires authentication</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="925"/>
+        <source>Password</source>
+        <translation>Password</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>Tegn dykkercomputeres rapporterede loft rødt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="747"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>System Default</source>
         <translation>System Standard</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="767"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="419"/>
         <source>Pressure</source>
         <translation>Tryk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="421"/>
+        <location filename="../qt-ui/preferences.ui" line="446"/>
         <source>Volume</source>
         <translation>Volumen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="448"/>
+        <location filename="../qt-ui/preferences.ui" line="473"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="475"/>
+        <location filename="../qt-ui/preferences.ui" line="500"/>
         <source>Weight</source>
         <translation>Vægt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="517"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="507"/>
+        <location filename="../qt-ui/preferences.ui" line="532"/>
         <source>Time units</source>
         <translation>Tids enheder</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>Vis op- og nedstignings hastighed i</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="520"/>
+        <location filename="../qt-ui/preferences.ui" line="545"/>
         <source>Minutes</source>
         <translation>Minutter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="530"/>
+        <location filename="../qt-ui/preferences.ui" line="555"/>
         <source>Seconds</source>
         <translation>Sekunder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="562"/>
+        <location filename="../qt-ui/preferences.ui" line="587"/>
         <source>Show</source>
         <translation>Vis</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="693"/>
         <source>Show non-used cylinders in Equipment Tab</source>
         <translation>Vis ubrugte flasker i udstyrs tab&apos;en</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>Vis gennemsnits dybde</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>GFLow på max dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="691"/>
+        <location filename="../qt-ui/preferences.ui" line="716"/>
         <source>Misc</source>
         <translation>Blandet</translation>
     </message>
@@ -2077,35 +2228,65 @@ slet dem venligst først.</translation>
         <translation>Indstillinger</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="697"/>
+        <location filename="../qt-ui/preferences.ui" line="722"/>
         <source>GFLow</source>
         <translation>GFlow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="739"/>
         <source>GFHigh</source>
         <translation>GFHøj</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="24"/>
+        <source>System proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="25"/>
+        <source>HTTP proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="26"/>
+        <source>SOCKS proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="245"/>
         <source>Restart required</source>
         <translation>Genstart nødvendigt</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>Valg af nyt sprog vil kræve en genstart af Subsurface</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>Åben standard log fil</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>Subsurface XML filer (*.ssrf *.xml *.XML)</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="394"/>
+        <source>Warning</source>
+        <translation>Advarsel</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"/>
+    </message>
 </context>
 <context>
     <name>PrintDialog</name>
@@ -2246,72 +2427,72 @@ slet dem venligst først.</translation>
 <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>Ukendt</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>Dyk #%1 - %2</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>Max dybde: %1 %2</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>Varighed: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1918"/>
+        <location filename="../qt-ui/models.cpp" line="1898"/>
         <source>Gas Used:</source>
         <translation>Gas brugt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1920"/>
+        <location filename="../qt-ui/models.cpp" line="1900"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1922"/>
+        <location filename="../qt-ui/models.cpp" line="1902"/>
         <source>Max. CNS:</source>
         <translation>Max. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1924"/>
+        <location filename="../qt-ui/models.cpp" line="1904"/>
         <source>Weights:</source>
         <translation>Vægt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1929"/>
+        <location filename="../qt-ui/models.cpp" line="1909"/>
         <source>Notes:</source>
         <translation>Noter:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1936"/>
+        <location filename="../qt-ui/models.cpp" line="1916"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1938"/>
+        <location filename="../qt-ui/models.cpp" line="1918"/>
         <source>Buddy:</source>
         <translation>Makker:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1940"/>
+        <location filename="../qt-ui/models.cpp" line="1920"/>
         <source>Suit:</source>
         <translation>Dragt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1942"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>Viz:</source>
         <translation>Sigt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1944"/>
+        <location filename="../qt-ui/models.cpp" line="1924"/>
         <source>Rating:</source>
         <translation>Vurdering:</translation>
     </message>
@@ -2319,62 +2500,77 @@ slet dem venligst først.</translation>
 <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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/>
+        <source>Make first divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="906"/>
+        <source>Delete this divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="913"/>
         <source>Add Gas Change</source>
         <translation>Tilføj gas skift</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>Tilføj bogmærke</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>Fjern hændelse</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>Skjul tilsvarende hændelser</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>Rediger navn</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>Vis alle hændelser</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>Skjul hændelser</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>Skjul alle %1 hændelser?</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>Fjern de valgte hændelser?</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>%1 @ %2:%3</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>Rediger bogmærke navn</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>Brugerdefineret navn:</translation>
     </message>
@@ -2382,12 +2578,12 @@ slet dem venligst først.</translation>
 <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>LUFT</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>Fjern dette punkt</translation>
     </message>
@@ -2397,22 +2593,22 @@ slet dem venligst først.</translation>
         <translation>Luk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="34"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation>Gennemsnit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="37"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="40"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation>Maksimal</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>Naviger på kortet og dobbelt klik for at sætte lokationen</translation>
     </message>
@@ -2426,9 +2622,23 @@ slet dem venligst først.</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="128"/>
         <source>New starting number</source>
         <translation>Nyt start nummer</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="126"/>
+        <source>New number</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchBar</name>
+    <message>
+        <location filename="../qt-ui/searchbar.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ShiftImageTimesDialog</name>
@@ -2443,42 +2653,47 @@ slet dem venligst først.</translation>
         <translation>Skift tider på billede(r) med</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="102"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="95"/>
+        <source>h:mm</source>
+        <translation>h:mm</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="105"/>
         <source>earlier</source>
         <translation>Tidligere</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="109"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="112"/>
         <source>later</source>
         <translation>Senere</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>For at beregne tiden mellem dykkercomputerens ur og dit kameras ud, tag et billede af dykkercomputerens aktuelle tid, indlæs billedet på din computer og klik på denne knap.</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>Beregn kameratid</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>Vælg billede af dykkercomputerens ur</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>Hvilke dato/tid er vist på billedet?</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>Åben billed fil</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>Billed filer  (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2558,42 +2773,42 @@ slet dem venligst først.</translation>
 <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>Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/>
         <source>Connecting...</source>
         <translation>Forbinder...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="421"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="419"/>
         <source>Download finished</source>
         <translation>Download færdig</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>Download fejl; %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/>
         <source>Connection Error: </source>
         <translation>Forbindelses fejl:</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>Ugyldig bruger id</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>Kan ikke fortolke svar!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/>
         <source>Download Success!</source>
         <translation>Download succes!</translation>
     </message>
@@ -2609,17 +2824,17 @@ slet dem venligst først.</translation>
 <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>Beskrivelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2627,7 +2842,7 @@ slet dem venligst først.</translation>
 <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>Information</translation>
     </message>
@@ -2635,42 +2850,42 @@ slet dem venligst først.</translation>
 <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>Tjek for opdateringer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="37"/>
-        <source>&lt;h3&gt;Subsurface was unable to check for updates.&lt;/h3&gt;</source>
-        <translation>&lt;h3&gt;Subsurface kunne ikke tjekke for opdateringer.&lt;/h3&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="36"/>
+        <source>Subsurface was unable to check for updates.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
-        <source>&lt;br/&gt;&lt;b&gt;The following error occurred:&lt;/b&gt;&lt;br/&gt;</source>
-        <translation>&lt;br/&gt;&lt;b&gt;Følgende fejl opstod:&lt;/b&gt;&lt;br/&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="41"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="43"/>
-        <source>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Please check your internet connection.&lt;/b&gt;</source>
-        <translation>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Tjek venligst din internet forbindelse.&lt;/b&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
     </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>Du har den nyeste version af Subsurface</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>En ny version af Subsurface er tilgængelig.&lt;br/&gt;Klik på:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; For at downloade den.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="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>&lt;b&gt;En nye version af Subsurface er tilgængelig.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</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>Der opstod en fejl da der blev tjekket for opdateringer.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -2678,25 +2893,163 @@ slet dem venligst først.</translation>
 <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>Brugermanual</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>Kan ikke finde Subsurface manualen</translation>
     </message>
 </context>
 <context>
+    <name>UserSurvey</name>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="47"/>
+        <source>Subsurface User Survey</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="79"/>
+        <source>Recreational DIver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="92"/>
+        <source>Tech Diver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="105"/>
+        <source>Interested in dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="118"/>
+        <source>I am downloading dives from supported dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="131"/>
+        <source>I am importing dives from other software / sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="144"/>
+        <source>I am manually entering dives</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="190"/>
+        <source>Please type suggestions (in English) in the following box</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="27"/>
+        <source>
+Operating System: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="30"/>
+        <source>
+CPU Architecture: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="35"/>
+        <source>
+OS CPU Architecture %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="39"/>
+        <source>
+Language: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="73"/>
+        <source>Should we ask you later?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="74"/>
+        <source>Don&apos;t ask me again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="75"/>
+        <source>Ask Later</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="76"/>
+        <source>Ask again?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <source>Submit User Survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <source>Subsurface was unable to submit the user survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="101"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="102"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="111"/>
+        <source>Survey successfully submitted.</source>
+        <translation type="unfinished"/>
+    </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>Der opstod en fejl da der blev tjekket for opdateringer.&lt;br/&gt;&lt;br/&gt;%1</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>Beskrivelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="723"/>
+        <location filename="../qt-ui/models.cpp" line="721"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2744,12 +3097,12 @@ slet dem venligst først.</translation>
         <translation>Upload</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>Tiden er udløbet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="279"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="277"/>
         <source>Transfering data...</source>
         <translation>Overfører data...</translation>
     </message>
@@ -2757,37 +3110,37 @@ slet dem venligst først.</translation>
 <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</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="368"/>
+        <location filename="../qt-ui/models.cpp" line="373"/>
         <source>Weight</source>
         <translation>Vægt</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>Klik her, vil fjerne dette vægtsystem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="453"/>
+        <location filename="../qt-ui/models.cpp" line="458"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="454"/>
+        <location filename="../qt-ui/models.cpp" line="459"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="478"/>
+        <location filename="../qt-ui/models.cpp" line="483"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="484"/>
         <source>m</source>
         <translation>m</translation>
     </message>
@@ -2795,79 +3148,79 @@ slet dem venligst først.</translation>
 <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>År
 &gt;Måned / Tur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1643"/>
         <source>Duration 
  Total</source>
         <translation>Varighed
 Ialt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>
 Average</source>
         <translation>
 Gennemsnit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>
 Shortest</source>
         <translation>
 Kortest</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>
 Longest</source>
         <translation>
 Længst</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>Dybde (%1)
 Gennemsnit</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>
 Minimum</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>
 Maximum</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>SAC (%1)
 Gennemsnit</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>Temp. (%1)
@@ -2877,99 +3230,92 @@ Gennemsnit</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="58"/>
+        <location filename="../dive.c" line="87"/>
         <source>pascal</source>
         <translation>pascal</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>bar</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>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="104"/>
-        <location filename="../qt-gui.cpp" line="292"/>
-        <source>l</source>
-        <translation>l</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>cuft</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>m</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>fod</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>pund (lbs)</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>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1120"/>
+        <location filename="../dive.c" line="1237"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) eller (%s)</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>luft</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="170"/>
+        <location filename="../equipment.c" line="210"/>
         <source>integrated</source>
         <translation>integreret</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="171"/>
+        <location filename="../equipment.c" line="211"/>
         <source>belt</source>
         <translation>bælte</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="172"/>
+        <location filename="../equipment.c" line="212"/>
         <source>ankle</source>
         <translation>ankel</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="173"/>
+        <location filename="../equipment.c" line="213"/>
         <source>backplate weight</source>
         <translation>bagpladevægt</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="174"/>
+        <location filename="../equipment.c" line="214"/>
         <source>clip-on</source>
         <translation>Clip-On</translation>
     </message>
@@ -2986,253 +3332,253 @@ Gennemsnit</translation>
         <translation>Maksimum antal kolonner i CSV import er %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>none</source>
         <translation>Ingen</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>deco stop</source>
         <translation>deco stop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ascent</source>
         <translation>opstigning</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ceiling</source>
         <translation>Loft</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>workload</source>
         <translation>Arbejdsbyrde</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>transmitter</source>
         <translation>Sender</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>violation</source>
         <translation>Overtrædelse</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>bookmark</source>
         <translation>bogmærke</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>surface</source>
         <translation>overflade</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>safety stop</source>
         <translation>sikkerhedsstop</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>gasskifte</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (voluntary)</source>
         <translation>Sikkerhedsstop (frivillig)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (mandatory)</source>
         <translation>Sikkerhedsstop (Krævet)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>deepstop</source>
         <translation>dybe stop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>ceiling (safety stop)</source>
         <translation>Loft (sikkerhedsstop)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>divetime</source>
         <translation>dykketid</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>Under gulv</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>maxdepth</source>
         <translation>Maks. dybde</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>airtime</source>
         <translation>Lufttid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>heading</source>
         <translation>Overskrift</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>tissue level warning</source>
         <translation>Vævs advarsel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>non stop time</source>
         <translation>non stop time</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="163"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>invalid event number</source>
         <translation>Ugyldigt hændelses nummer</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>Kan ikke oprette parser for %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="411"/>
+        <location filename="../libdivecomputer.c" line="414"/>
         <source>Error registering the data</source>
         <translation>Fejl i registrering af data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="419"/>
+        <location filename="../libdivecomputer.c" line="422"/>
         <source>Error parsing the datetime</source>
         <translation>Fejl ved fortolkning af dato/tid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="438"/>
         <source>Dive %d: %s %d %04d</source>
         <translation>Dyk %d: %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="440"/>
+        <location filename="../libdivecomputer.c" line="443"/>
         <source>Error parsing the divetime</source>
         <translation>Fejl i fortolkning af dykkertid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="449"/>
+        <location filename="../libdivecomputer.c" line="452"/>
         <source>Error parsing the maxdepth</source>
         <translation>Fejl i fortolkning af max dybde</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="458"/>
+        <location filename="../libdivecomputer.c" line="461"/>
         <source>Error parsing the gas mix count</source>
         <translation>Fejl i fortolkning af antallet af gasser</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="470"/>
+        <location filename="../libdivecomputer.c" line="473"/>
         <source>Error obtaining water salinity</source>
         <translation>Fejl i læsning af saltindhold i vandet</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error obtaining surface pressure</source>
         <translation>Fejl ved at opnå overflade tryk</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the gas mix</source>
         <translation>Fejl i fortolkning af gas blanding</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="493"/>
+        <location filename="../libdivecomputer.c" line="496"/>
         <source>Error parsing the samples</source>
         <translation>Fejl i fortolkning af prøver</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="623"/>
+        <location filename="../libdivecomputer.c" line="626"/>
         <source>Event: waiting for user action</source>
         <translation>Event: waiting for user action</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>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="691"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the event handler.</source>
         <translation>Fejl: registering the event handler.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="696"/>
+        <location filename="../libdivecomputer.c" line="699"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Fejl: registering the cancellation handler.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="717"/>
+        <location filename="../libdivecomputer.c" line="720"/>
         <source>Dive data import error</source>
         <translation>Import fejl i dykker data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="756"/>
+        <location filename="../libdivecomputer.c" line="759"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Kan ikke danne libdivecomputer context</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="763"/>
+        <location filename="../libdivecomputer.c" line="766"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Kan ikke åbne %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="462"/>
+        <location filename="../parse-xml.c" line="466"/>
         <source>Strange percentage reading %s
 </source>
         <translation> Mærkelig procent læsning %s
 </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>Fejl i fortolkning af &apos;%s&apos;</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>Database forespørgsel get_events fejlede
  </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>Database query get_tags failed.
@@ -3240,118 +3586,166 @@ Gennemsnit</translation>
     </message>
     <message>
         <location filename="../file.c" line="166"/>
-        <source>Database connection failed &apos;%s&apos;.
+        <source>Database connection failed '%s'.
 </source>
         <translation>Database forbindelse fejlede &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1887"/>
-        <location filename="../parse-xml.c" line="2034"/>
-        <source>Database query failed &apos;%s&apos;.
+        <location filename="../parse-xml.c" line="1945"/>
+        <location filename="../parse-xml.c" line="2092"/>
+        <source>Database query failed '%s'.
 </source>
         <translation>Database forespørgsel fejlede &apos;%s&apos;.
 </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>Database query get_cylinders failed.
 </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>Database query get_changes failed.
 </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>Database query get_profile_sample failed.
 </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>Kan ikke åbne stylesheet %s</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>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="146"/>
-        <location filename="../planner.c" line="617"/>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation>Kan ikke finde gas %d/%d</translation>
+        <location filename="../planner.c" line="159"/>
+        <location filename="../planner.c" line="752"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="308"/>
+        <location filename="../planner.c" line="345"/>
         <source>Too many gas mixes</source>
         <translation>For mange gas blandinger</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="489"/>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation>%s⏎
-Subsurface dykkerplan⏎
-baseret på GFlow = %.0f og GFhigh = %.0f⏎
-
-</translation>
+        <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>ANSVARSFRISKRIVELSE: Dette er en ny implementering af BUHLMANN algoritmen og dykkerplaner og har kun haft begrænset tests. Vi anbefaler der stærkt at der ikke planlægges dyk ALENE baseret på dette resultat.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="530"/>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Skift til %.*f %s om %d:%02d min - runtime %d:%02u on %s
-</translation>
+        <location filename="../planner.c" line="535"/>
+        <source>based on GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="539"/>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Stop på %.*f %s i %d:%02d min - runtime %d:%02u i %s
-</translation>
+        <location filename="../planner.c" line="538"/>
+        <source>Subsurface dive plan</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="550"/>
-        <source>Switch gas to %s
-</source>
-        <translation>Skift gas til %s⏎
-</translation>
+        <location filename="../planner.c" line="542"/>
+        <source>depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="558"/>
-        <source>Gas consumption:
-</source>
-        <translation>Gasforbrug:
-</translation>
+        <location filename="../planner.c" line="545"/>
+        <source>runtime</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="569"/>
-        <source>%.0f%s of %s
-</source>
-        <translation>%.0f%s of %s⏎
-
-</translation>
+        <location filename="../planner.c" line="548"/>
+        <source>duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="551"/>
+        <source>gas</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="606"/>
+        <source>%3.0f%s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
+        <source>%3dmin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="629"/>
+        <source>Switch gas to %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="638"/>
+        <source>Gas consumption:</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="659"/>
+        <source>this is more gas than available in the specified cylinder!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="810"/>
+        <location filename="../planner.c" line="664"/>
+        <source>not enough reserve for gas sharing on ascent!</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="668"/>
+        <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="980"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1226"/>
+        <location filename="../profile.c" line="1250"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3361,7 +3755,7 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1229"/>
+        <location filename="../profile.c" line="1253"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
@@ -3369,63 +3763,62 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1233"/>
+        <location filename="../profile.c" line="1257"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1263"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </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>SAC: %2.1fl/min
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1244"/>
+        <location filename="../profile.c" line="1268"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1246"/>
+        <location filename="../profile.c" line="1270"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1272"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="1274"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="1277"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1260"/>
+        <location filename="../profile.c" line="1284"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3434,7 +3827,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1264"/>
+        <location filename="../profile.c" line="1288"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3443,398 +3836,391 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1276"/>
+        <location filename="../profile.c" line="1300"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Sikkerhedsstop: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1279"/>
+        <location filename="../profile.c" line="1303"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Sikkerhedsstop: ukendt tid @ %.0f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="1308"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
+        <location filename="../profile.c" line="1311"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deko: unkn time @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1291"/>
+        <location filename="../profile.c" line="1315"/>
         <source>In deco
 </source>
         <translation>I deko
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1293"/>
+        <location filename="../profile.c" line="1317"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1297"/>
+        <location filename="../profile.c" line="1321"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1305"/>
+        <location filename="../profile.c" line="1329"/>
         <source>In deco (calc)
 </source>
         <translation>In deko (beregn)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1307"/>
+        <location filename="../profile.c" line="1331"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (beregn)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1310"/>
+        <location filename="../profile.c" line="1334"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (beregn)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1313"/>
+        <location filename="../profile.c" line="1337"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Beregnet loft %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1319"/>
+        <location filename="../profile.c" line="1343"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Væv %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1325"/>
+        <location filename="../profile.c" line="1349"/>
         <source>heartbeat: %d
 </source>
         <translation>Hjertefrekvens: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1327"/>
+        <location filename="../profile.c" line="1351"/>
         <source>bearing: %d
 </source>
         <translation>bærende: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1419"/>
+        <location filename="../profile.c" line="1443"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</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>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1435"/>
+        <location filename="../profile.c" line="1459"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1439"/>
+        <location filename="../profile.c" line="1463"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</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>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1454"/>
+        <location filename="../profile.c" line="1478"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s
 </translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="273"/>
+        <location filename="../qt-gui.cpp" line="281"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="276"/>
+        <location filename="../qt-gui.cpp" line="284"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="392"/>
-        <source>%1, %2 %3, %4 %5:%6</source>
-        <translation>%1, %2 %3, %4 %5:%6</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="405"/>
-        <source>%1 %2, %3
-%4:%5</source>
-        <translation>%1 %2, %3
- %4:%5</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="418"/>
+        <location filename="../qt-gui.cpp" line="417"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 dyk)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="423"/>
+        <location filename="../qt-gui.cpp" line="422"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 dyk)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>boat</source>
         <translation>Båd</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>shore</source>
         <translation>Kyst</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>drift</source>
         <translation>Strøm</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>deep</source>
         <translation>dybde</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>cavern</source>
         <translation>hule</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>ice</source>
         <translation>is</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>wreck</source>
         <translation>vrag</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>cave</source>
         <translation>grotte</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>altitude</source>
         <translation>Højde</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>pool</source>
         <translation>svømmehal</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>lake</source>
         <translation>sø</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>river</source>
         <translation>flod</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>night</source>
         <translation>nat</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>fresh</source>
         <translation>Fersk</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>student</source>
         <translation>Elev</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>photo</source>
         <translation>foto</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>video</source>
         <translation>video</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>instructor</source>
         <translation>Instruktør</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="25"/>
         <source>deco</source>
         <translation>deco</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="216"/>
+        <location filename="../dive.c" line="133"/>
+        <source>ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="214"/>
         <source>more than %d days</source>
         <translation>mere end %d dage</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="220"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="224"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="235"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation>for dyk #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="242"/>
+        <location filename="../statistics.c" line="240"/>
         <source>for selected dives</source>
         <translation>for de valgte dyk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="275"/>
         <source>for dive #%d</source>
         <translation>for dyk #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for selected dive</source>
         <translation>for valgt dyk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for all dives</source>
         <translation>for alle dyk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="283"/>
+        <location filename="../statistics.c" line="281"/>
         <source>(no dives)</source>
         <translation>(ingen dyk)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sun</source>
         <translation>Søn</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Mon</source>
         <translation>Man</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Tue</source>
         <translation>Tir</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Wed</source>
         <translation>Ons</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Thu</source>
         <translation>Tor</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Fri</source>
         <translation>Fre</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sat</source>
         <translation>Lør</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>May</source>
         <translation>Maj</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Dec</source>
         <translation>Dec</translation>
     </message>
@@ -3864,97 +4250,97 @@ Is the Uemis Zurich plugged in correctly?</source>
 Er Uemis Zurich tilsluttet korrekt?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="107"/>
+        <location filename="../uemis-downloader.c" line="111"/>
         <source>unknown</source>
         <translation>Ukendt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="379"/>
+        <location filename="../uemis-downloader.c" line="383"/>
         <source>Reading %s %s</source>
         <translation>Læser %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="399"/>
+        <location filename="../uemis-downloader.c" line="403"/>
         <source>data</source>
         <translation>data</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="420"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>divelog entry id</source>
         <translation>Dykkerlog indgang id</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="422"/>
+        <location filename="../uemis-downloader.c" line="426"/>
         <source>divespot data id</source>
         <translation>Dykkersted data id</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
+        <location filename="../uemis-downloader.c" line="428"/>
         <source>more data dive id</source>
         <translation>Flere dykker data id</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>wetsuit</source>
         <translation>våddragt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>semidry</source>
         <translation>semidry</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>drysuit</source>
         <translation>tørdragt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>shorty</source>
         <translation>shorty</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>vest</source>
         <translation>vest</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>long john</source>
         <translation>Long John</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>jacket</source>
         <translation>Jakke</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>full suit</source>
         <translation>heldragt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>2 pcs full suit</source>
         <translation>2-delt heldragt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="620"/>
+        <location filename="../uemis-downloader.c" line="624"/>
         <source>membrane</source>
         <translation>membran</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="802"/>
+        <location filename="../uemis-downloader.c" line="823"/>
         <source>Init Communication</source>
         <translation>Init Communication</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="804"/>
+        <location filename="../uemis-downloader.c" line="825"/>
         <source>Uemis init failed</source>
         <translation>Uemis start op fejlede</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="815"/>
+        <location filename="../uemis-downloader.c" line="836"/>
         <source>Start download</source>
         <translation>Begynd download</translation>
     </message>
@@ -3975,18 +4361,18 @@ Er Uemis Zurich tilsluttet korrekt?</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="203"/>
-        <source>PO2 Green Warning</source>
-        <translation>PO2 Grøn advarsel</translation>
+        <source>pO₂ Green Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
-        <source>PO2 Ascend Warning</source>
-        <translation>PO2 opstignings alarm</translation>
+        <source>pO₂ Ascend Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="208"/>
-        <source>PO2 Ascend Alarm</source>
-        <translation>PO2 opstignings alarm</translation>
+        <source>pO₂ Ascend Alarm</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
@@ -4048,5 +4434,214 @@ Er Uemis Zurich tilsluttet korrekt?</translation>
         <source>Low Battery Alert</source>
         <translation>Lav batteri alarm</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"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="36"/>
+        <source>Date:</source>
+        <translation>Dato:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="38"/>
+        <source>Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="40"/>
+        <source>Duration:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="41"/>
+        <source>min</source>
+        <translation>min.</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="43"/>
+        <source>Max Depth:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="46"/>
+        <source>Air Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="48"/>
+        <source>Water Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="50"/>
+        <source>Location:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="54"/>
+        <source>Notes:</source>
+        <translation>Noter:</translation>
+    </message>
+</context>
+<context>
+    <name>plannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="35"/>
+        <source>Rates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="56"/>
+        <source>Ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="77"/>
+        <source>below 75% avg. depth</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="94"/>
+        <source>75%-50% avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="111"/>
+        <source>50% avg. depth - 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="128"/>
+        <source>6m/20ft to surface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="148"/>
+        <source>Descent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="200"/>
+        <source>surface to the bottom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="226"/>
+        <source>Planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="247"/>
+        <source>GF low</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="264"/>
+        <source>GF high</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
+        <source>Drop to first depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
+        <source>Last Stop at 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>plan backgas breaks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="318"/>
+        <source>Gas Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <source>bottom SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="349"/>
+        <source>deco SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="359"/>
+        <source>bottom pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="389"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="382"/>
+        <source>deco pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="421"/>
+        <source>Dive Notes</source>
+        <translation>Dyk Noter</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="445"/>
+        <source>display runtime</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="458"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="461"/>
+        <source>display segment duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="471"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="474"/>
+        <source>display transitions in deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="481"/>
+        <source>verbatim diveplan</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/subsurface_de_CH.ts b/translations/subsurface_de_CH.ts
index 20db5cf1c..789317be5 100644
--- a/translations/subsurface_de_CH.ts
+++ b/translations/subsurface_de_CH.ts
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="de_CH" version="2.0">
+<defaultcodec>UTF-8</defaultcodec>
 <context>
     <name>CylindersModel</name>
     <message>
@@ -37,42 +38,42 @@
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="71"/>
+        <location filename="../qt-ui/models.cpp" line="70"/>
         <source>Switch at</source>
         <translation>Wechsel bei</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>Hier klicken entfernt diese Flasche.</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>Flasche kann nicht entfernt werden</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>Dieses Gas wird verwendet. Nur Flaschen die nicht im Tauchgang verwendet werden können entfernt werden.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="507"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="508"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="527"/>
+        <location filename="../qt-ui/models.cpp" line="532"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="528"/>
+        <location filename="../qt-ui/models.cpp" line="533"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -99,22 +100,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>Modell</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Device ID</source>
         <translation>Gerätebezeichnung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Nickname</source>
         <translation>Gerätename</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>Hier klicken entfernt diesen Tauchcomputer.</translation>
     </message>
@@ -122,190 +123,326 @@
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="90"/>
-        <source>air</source>
-        <translation>Luft</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="92"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</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>Notausstieg mit offenem System</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> Anfang</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> Ende</translation>
     </message>
 </context>
 <context>
-    <name>DiveGasPressureItem</name>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="475"/>
-        <source>air</source>
-        <translation>Luft</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="476"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-</context>
-<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1258"/>
-        <source> l/min</source>
-        <translation> l/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
-        <source> cuft/min</source>
-        <translation> cuft/min</translation>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <source>/min</source>
+        <translation>/min</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>Suchfeld anzeigen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="706"/>
         <source>expand all</source>
         <translation>Alle ausklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="740"/>
+        <location filename="../qt-ui/divelistview.cpp" line="707"/>
         <source>collapse all</source>
         <translation>Alle einklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="741"/>
+        <location filename="../qt-ui/divelistview.cpp" line="708"/>
         <source>collapse others</source>
         <translation>Andere einklappen</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>Entferne Tauchgang aus Reise</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>Neue Reise darüber einfügen</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>Tauchgäng(e) zur Reise darüber hinzufügen</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>Tauchgäng(e) zur Reise darunter hinzufügen</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>Reise mit Reise darüber verbinden</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>Reise mit Reise darunter verbinden</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>Tauchgang löschen</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>Tauchgang(gänge) als ungültig kennzeichnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
-        <source>save As</source>
-        <translation>Speichern unter</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="763"/>
-        <source>export As UDDF</source>
-        <translation>Als UDDF exportieren</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="764"/>
-        <source>export As CSV</source>
-        <translation>Als CSV exportieren</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="744"/>
+        <source>renumber dive(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="765"/>
+        <location filename="../qt-ui/divelistview.cpp" line="745"/>
         <source>shift times</source>
         <translation>Zeiten verschieben</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="766"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>load images</source>
         <translation>lade Bilder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="769"/>
-        <source>upload dive(s) to divelogs.de</source>
-        <translation>Tauchgang(gänge) auf divelogs.de hochladen</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Open Image Files</source>
+        <translation>Öffne Bilddateien</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation>Bilddateien (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <source>merge selected dives</source>
+        <translation>Ausgewählte Tauchgänge zusammenführen</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="24"/>
+        <source>General Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="30"/>
+        <source>Export format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="42"/>
+        <source>Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="61"/>
+        <source>UDDF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="74"/>
+        <source>divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="84"/>
+        <source>CSV</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="94"/>
+        <source>Worldmap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="107"/>
+        <source>Selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="116"/>
+        <source>Selected dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="126"/>
+        <source>All dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="178"/>
+        <source>HTML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="184"/>
+        <source>General Settings</source>
+        <translation>Allg. Einstellungen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="190"/>
+        <source>Subsurface Numbers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="203"/>
+        <source>Selected Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="216"/>
+        <source>Minimum Javascript</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="229"/>
+        <source>All Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="239"/>
+        <source>Export List only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="252"/>
+        <source>Style Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="264"/>
+        <source>Font</source>
+        <translation>Schriftart</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="274"/>
+        <source>Font size</source>
+        <translation>Schriftgrösse</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
+        <source>8</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <source>10</source>
+        <translation>10</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <source>12</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <source>14</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="795"/>
-        <source>Save Dives As...</source>
-        <translation>Speichere Tauchgänge als...</translation>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <source>16</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="814"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <source>18</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <source>20</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="323"/>
+        <source>Theme</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <source>Sand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="153"/>
         <source>Export UDDF File as</source>
         <translation>Exportiere UDDF Datei als</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>UDDF Dateien (*.uddf *.UDDF)</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>Exportiere CSV Datei als</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>CSV Dateien (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Open Image Files</source>
-        <translation>Öffne Bilddateien</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="162"/>
+        <source>Export World Map</source>
+        <translation>Weltkarte exportieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
-        <translation>Bilddateien (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="163"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="177"/>
+        <source>HTML files (*.html)</source>
+        <translation>HTML Dateien (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="760"/>
-        <source>merge selected dives</source>
-        <translation>Ausgewählte Tauchgänge zusammenführen</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="167"/>
+        <source>Export Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="168"/>
+        <source>XML files (*.xml *.ssrf)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="176"/>
+        <source>Export HTML files as</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -316,138 +453,133 @@
         <translation>Importiere Tauchlog Datei</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="36"/>
-        <source>Import CSV Dive Log Files</source>
-        <translation>Importiere CSV Tauchlog Datei</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="50"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
         <source>CSV options</source>
         <translation>CSV Optionen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="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>Feld Trenner</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>Vorkonfigurierte Importe</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>Feldkonfiguration</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="80"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="100"/>
         <source>Stopdepth</source>
         <translation>Stopptiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="107"/>
         <source>PO2</source>
         <translation>PO₂</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>Zeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="121"/>
         <source>Temp</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="151"/>
         <source>Cns</source>
         <translation>CNS</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>Einheiten</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>Metrisch</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>Zöllig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="248"/>
         <source>Manual dives</source>
         <translation>Manuelle Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="283"/>
         <source>Dive #</source>
         <translation>Tauchgang Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="317"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="385"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="470"/>
         <source>Tags</source>
         <translation>Stichworte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
         <source>Location</source>
         <translation>Ort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="453"/>
         <source>Gps</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="300"/>
         <source>Max depth</source>
         <translation>Max. Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="334"/>
         <source>Mean depth</source>
         <translation>Mittlere Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="368"/>
         <source>Buddy</source>
-        <translation>Partner</translation>
+        <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="402"/>
         <source>Notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="436"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
@@ -455,105 +587,70 @@
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="71"/>
-        <source>Bottom SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="85"/>
-        <source>SAC on DECO Stop</source>
-        <translation>Deko-SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="78"/>
-        <source>GFHigh</source>
-        <translation>GF high</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="98"/>
-        <source>GFLow</source>
-        <translation>GF low</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="106"/>
+        <source>Planned Dive Time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="125"/>
-        <source>Last Stop at 6m</source>
-        <translation>Letzter Stopp auf 6m</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="134"/>
+        <source>Altitude</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="174"/>
-        <source>Start Time</source>
-        <translation>Startzeit</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="181"/>
+        <location filename="../qt-ui/diveplanner.ui" line="141"/>
         <source>ATM Pressure</source>
         <translation>Oberflächendruck</translation>
     </message>
-</context>
-<context>
-    <name>DivePlannerGraphics</name>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="114"/>
-        <source>10m</source>
-        <translation>10m</translation>
-    </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="116"/>
-        <source>30ft</source>
-        <translation>30ft</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="148"/>
+        <source>mbar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="363"/>
-        <source>Handler Position Error</source>
-        <translation>Problematische Position des Knotens</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>
-        <translation>Einer oder mehrere Deiner Stopps werden hierdurch verloren gehen.
-Bitte entferne diese zuerst.</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="158"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="445"/>
-        <source>AIR</source>
-        <translation>Luft</translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="137"/>
+        <source>unknown</source>
+        <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1148"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="586"/>
         <source>Final Depth</source>
         <translation>Endtiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1150"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="588"/>
         <source>Run time</source>
         <translation>Laufzeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1152"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="590"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1154"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="592"/>
         <source>Used Gas</source>
         <translation>Gasverbrauch</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>CC Set Point</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>Plan verwerfen?</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>Du bist dabei Deinen Plan zu verwerfen.</translation>
     </message>
@@ -561,17 +658,17 @@ Bitte entferne diese zuerst.</translation>
 <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>Planerpunkte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="256"/>
         <source>Available Gases</source>
         <translation>Verfügbare Gase</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>Datenpunkt hinzufügen</translation>
     </message>
@@ -615,8 +712,23 @@ Bitte entferne diese zuerst.</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
-        <source>Pressure  S</source>
-        <translation>Druck S</translation>
+        <source>Pressure S</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <source>pN₂</source>
+        <translation>pN₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>pHe</source>
+        <translation>pHe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
@@ -633,86 +745,71 @@ Bitte entferne diese zuerst.</translation>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
-        <source>PN2</source>
-        <translation>pN₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
-        <source>PHE</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
-        <source>PO2</source>
-        <translation>pO₂</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>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1298"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
+        <location filename="../qt-ui/models.cpp" line="1307"/>
         <source>suit</source>
         <translation>Anzug</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1310"/>
         <source>cyl</source>
         <translation>Flasche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1344"/>
+        <location filename="../qt-ui/models.cpp" line="1325"/>
         <source>location</source>
         <translation>Tauchplatz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1316"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1338"/>
+        <location filename="../qt-ui/models.cpp" line="1319"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1341"/>
+        <location filename="../qt-ui/models.cpp" line="1322"/>
         <source>maxCNS</source>
         <translation>max. CNS</translation>
     </message>
@@ -720,115 +817,115 @@ Bitte entferne diese zuerst.</translation>
 <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>Ungültige Serverantwort</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>%1 anstelle des erwarteten XML Tags &apos;DiveDateReader&apos;.</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>XML Tag &apos;DiveDates&apos; nicht gefunden.</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>Ungültige XML Antwort. Zeile %1: %2</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>keine Tauchgänge ausgewählt</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>konnte keine zip Datei für die Übertragung erstellen: %s</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>kann keine temporäre Datei erstellen: %s</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>ein Fehler ist aufgetreten: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="181"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="179"/>
         <source>internal error</source>
         <translation>ein interner Fehler ist aufgetreten</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>Fertig</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>Übertrage Liste der Tauchgänge</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>Liste der Tauchgänge herunterladen...</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>Lade %1 Tauchgänge vom Server...</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>Herunterladen beendet - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
         <source>Corrupted download</source>
         <translation>Heruntergeladene Daten sind beschädigt.</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>Das Archiv konnte nicht geöffnet werden
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Upload failed</source>
         <translation>Übertragung fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="849"/>
         <source>Upload successful</source>
         <translation>Übertragung erfolgreich</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="854"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="852"/>
         <source>Login failed</source>
         <translation>Login fehlgeschlagen</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>Verstehe die Antwort nicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="868"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Error: %1</source>
         <translation>Fehler: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="835"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/>
         <source>Upload finished</source>
         <translation>Übertragung beendet</translation>
     </message>
@@ -836,54 +933,54 @@ Bitte entferne diese zuerst.</translation>
 <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>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="165"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/>
         <source>Error</source>
         <translation>Fehler</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>Wiederholen</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>Finde Uemis Tauchcomputer</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>Datei auswählen, in die das libdivecomputer Log gespeichert wird</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>Log Dateien (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="339"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
         <source>Warning</source>
         <translation>Warnung</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>Wenn der libdivecomputer Dump gespeichert wird, werden keine Tauchgänge zur Liste der Tauchgänge hinzugefügt.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="351"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="352"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Datei auswählen, in die der libdivecomputer Dump gespeichert wird</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="353"/>
         <source>Dump files (*.bin)</source>
         <translation>Dump Dateien (*.bin)</translation>
     </message>
@@ -951,7 +1048,7 @@ Bitte entferne diese zuerst.</translation>
 <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>Ausgewählte Tauchplätze bearbeiten</translation>
     </message>
@@ -960,848 +1057,854 @@ Bitte entferne diese zuerst.</translation>
     <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>Notizen</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>Ort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="148"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Coordinates</source>
         <translation>Koordinaten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="169"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
         <source>Divemaster</source>
-        <translation>Tauchgruppenleiter</translation>
+        <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="155"/>
+        <location filename="../qt-ui/maintab.ui" line="148"/>
         <source>Buddy</source>
-        <translation>Partner</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="63"/>
-        <source>Start time</source>
-        <translation>Startzeit</translation>
+        <translation>Buddy</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>Lufttemperatur</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>Wassertemperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="127"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Tags</source>
         <translation>Stichworte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="223"/>
         <source>Rating</source>
         <translation>Bewertung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="236"/>
         <source>Visibility</source>
         <translation>Sicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="215"/>
+        <location filename="../qt-ui/maintab.ui" line="127"/>
         <source>Suit</source>
         <translation>Anzug</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>Notizen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="270"/>
+        <location filename="../qt-ui/maintab.ui" line="311"/>
         <source>Equipment</source>
         <translation>Ausrüstung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="350"/>
+        <location filename="../qt-ui/maintab.ui" line="391"/>
         <source>Dive Info</source>
         <translation>Informationen</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>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="414"/>
+        <location filename="../qt-ui/maintab.ui" line="275"/>
+        <source>Time</source>
+        <translation>Zeit</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="455"/>
         <source>Interval</source>
         <translation>Oberflächenpause</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="433"/>
+        <location filename="../qt-ui/maintab.ui" line="474"/>
         <source>Gases Used</source>
         <translation>Verw. Gase</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="452"/>
+        <location filename="../qt-ui/maintab.ui" line="493"/>
         <source>Gas Consumed</source>
         <translation>Verbrauchtes Gas</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>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="531"/>
         <source>Max. Depth</source>
         <translation>Max. Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="509"/>
+        <location filename="../qt-ui/maintab.ui" line="550"/>
         <source>Ave. Depth</source>
         <translation>Ø Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="528"/>
+        <location filename="../qt-ui/maintab.ui" line="569"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="547"/>
+        <location filename="../qt-ui/maintab.ui" line="588"/>
         <source>Air Pressure</source>
         <translation>Luftdruck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="566"/>
+        <location filename="../qt-ui/maintab.ui" line="607"/>
         <source>Air Temperature</source>
         <translation>Lufttemperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="585"/>
+        <location filename="../qt-ui/maintab.ui" line="626"/>
         <source>Water Temperature</source>
         <translation>Wassertemperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="604"/>
+        <location filename="../qt-ui/maintab.ui" line="645"/>
         <source>Dive Time</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="623"/>
+        <location filename="../qt-ui/maintab.ui" line="664"/>
         <source>Salinity</source>
         <translation>Salzgehalt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="660"/>
+        <location filename="../qt-ui/maintab.ui" line="701"/>
         <source>Stats</source>
         <translation>Statistiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="746"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="784"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Total Time</source>
         <translation>Gesamtzeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="835"/>
         <source>Dives</source>
         <translation>Tauchgänge</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="919"/>
+        <source>Photos</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="89"/>
         <source>Cylinders</source>
         <translation>Flaschen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="90"/>
         <source>Add Cylinder</source>
         <translation>Flasche hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="93"/>
         <source>Weights</source>
         <translation>Blei</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>Gewichtsystem hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="438"/>
+        <location filename="../qt-ui/maintab.cpp" line="409"/>
         <source>Trip Location</source>
         <translation>Ziel der Reise</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>Reisenotizen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="42"/>
+        <location filename="../qt-ui/maintab.cpp" line="48"/>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="46"/>
+        <location filename="../qt-ui/maintab.cpp" line="52"/>
         <source>Cancel</source>
         <translation>Abbrechen</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>Lufttemperatur [%1]</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>Wassertemperatur [%1]</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>Diese Reise wird bearbeitet.</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>Mehrere Tauchgänge werden bearbeitet.</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>Dieser Tauchgang wird bearbeitet.</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>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="494"/>
+        <location filename="../qt-ui/maintab.cpp" line="464"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>N</source>
-        <translation>N</translation>
+        <location filename="../qt-ui/maintab.cpp" line="501"/>
+        <source>Deepest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>S</source>
-        <translation>S</translation>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <source>Shallowest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>E</source>
-        <translation>O</translation>
+        <location filename="../qt-ui/maintab.cpp" line="794"/>
+        <source>Discard the Changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>W</source>
-        <translation>W</translation>
+        <location filename="../qt-ui/maintab.cpp" line="795"/>
+        <source>You are about to discard your changes.</source>
+        <translation type="unfinished"/>
     </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>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="571"/>
+        <location filename="../qt-ui/mainwindow.ui" line="646"/>
         <source>&amp;File</source>
         <translation>&amp;Datei</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="583"/>
+        <source>Print</source>
+        <translation>Drucken</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:'Courier'; 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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="606"/>
+        <location filename="../qt-ui/mainwindow.ui" line="679"/>
         <source>&amp;View</source>
         <translation>&amp;Ansicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="628"/>
+        <location filename="../qt-ui/mainwindow.ui" line="701"/>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="636"/>
+        <location filename="../qt-ui/mainwindow.ui" line="709"/>
         <source>&amp;Import</source>
         <translation>&amp;Importieren</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>&amp;Neues Logbuch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="655"/>
+        <location filename="../qt-ui/mainwindow.ui" line="728"/>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="658"/>
+        <location filename="../qt-ui/mainwindow.ui" line="731"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</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>Logbuch &amp;öffnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="666"/>
+        <location filename="../qt-ui/mainwindow.ui" line="739"/>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <location filename="../qt-ui/mainwindow.ui" line="742"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="674"/>
+        <location filename="../qt-ui/mainwindow.ui" line="747"/>
         <source>&amp;Save</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="677"/>
+        <location filename="../qt-ui/mainwindow.ui" line="750"/>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="680"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>Save as</source>
         <translation>Speichern unter</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>Ctrl+Shift+S</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>Schliessen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Close</source>
         <translation>Schliessen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="702"/>
+        <location filename="../qt-ui/mainwindow.ui" line="775"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="902"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <source>P&amp;references</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="831"/>
+        <source>&amp;Add Dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <source>Auto &amp;Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="863"/>
+        <source>&amp;Dive List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="871"/>
+        <source>&amp;Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="879"/>
+        <source>&amp;Info</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="887"/>
+        <source>&amp;All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="895"/>
+        <source>P&amp;rev DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="903"/>
+        <source>&amp;Next DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="911"/>
+        <source>&amp;Select Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <source>&amp;About Subsurface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="937"/>
+        <source>&amp;Globe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="953"/>
+        <source>&amp;Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="959"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="707"/>
-        <source>Export &amp;UDDF</source>
-        <translation>Exportiere &amp;UDDF</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="1008"/>
+        <source>&amp;Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1011"/>
+        <source>Export Dive Logs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1014"/>
+        <source>Ctrl+E</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Enable the pN2 Graph</source>
         <translation>Blende pN₂ Kurve ein</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <location filename="../qt-ui/mainwindow.ui" line="128"/>
         <source>Enable the pHe graph</source>
         <translation>Blende pHe Kurve ein</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <location filename="../qt-ui/mainwindow.ui" line="290"/>
         <source>Show/hide heart rate</source>
         <translation>Pulsrate anzeigen/verbergen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <location filename="../qt-ui/mainwindow.ui" line="342"/>
         <source>Enable EAD, END, and EADD</source>
         <translation>EAD, END, EADD anzeigen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="238"/>
         <source>Show NDL / TTS</source>
         <translation>Zeige NTL / TTS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="456"/>
+        <location filename="../qt-ui/mainwindow.ui" line="394"/>
         <source>Rescale depth axis</source>
         <translation>Tiefenachse neu skalieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="710"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="715"/>
-        <source>Export HTML World Map</source>
-        <translation>HTML Weltkarte exportieren</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="718"/>
-        <source>Ctrl+H</source>
-        <translation>Ctrl+H</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="723"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>&amp;Print</source>
         <translation>&amp;Drucken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="734"/>
+        <location filename="../qt-ui/mainwindow.ui" line="791"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="742"/>
+        <location filename="../qt-ui/mainwindow.ui" line="799"/>
         <source>&amp;Quit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="753"/>
+        <location filename="../qt-ui/mainwindow.ui" line="810"/>
         <source>Import from &amp;dive computer</source>
         <translation>Von &amp;Tauchcomputer importieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="818"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation>&amp;GPS Daten vom Subsurface Service importieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="764"/>
+        <location filename="../qt-ui/mainwindow.ui" line="821"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="826"/>
         <source>&amp;Edit Device Names</source>
         <translation>Gerätenamen &amp;bearbeiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="834"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="782"/>
+        <location filename="../qt-ui/mainwindow.ui" line="839"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Neu nummerieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="785"/>
+        <location filename="../qt-ui/mainwindow.ui" line="842"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="798"/>
+        <location filename="../qt-ui/mainwindow.ui" line="855"/>
         <source>&amp;Yearly Statistics</source>
         <translation>&amp;Jahresstatistiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="801"/>
+        <location filename="../qt-ui/mainwindow.ui" line="858"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="806"/>
-        <source>Dive List</source>
-        <translation>Tauchgangliste</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="814"/>
-        <source>Profile</source>
-        <translation>Profil</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="822"/>
-        <source>Info</source>
-        <translation>Informationen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="830"/>
-        <source>All</source>
-        <translation>Alle</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="872"/>
+        <location filename="../qt-ui/mainwindow.ui" line="929"/>
         <source>User &amp;Manual</source>
         <translation>&amp;Bedienungsanleitung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="880"/>
-        <source>Globe</source>
-        <translation>Globus</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="888"/>
+        <location filename="../qt-ui/mainwindow.ui" line="945"/>
         <source>P&amp;lan Dive</source>
         <translation>Tauchgang p&amp;lanen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="891"/>
+        <location filename="../qt-ui/mainwindow.ui" line="948"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="907"/>
-        <source>Import from Divelogs.de</source>
-        <translation>von Divelogs.de importieren</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1003"/>
         <source>&amp;Check for Updates</source>
         <translation>Neue Version suchen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="951"/>
-        <source>Export CSV</source>
-        <translation>Exportiere CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="726"/>
+        <location filename="../qt-ui/mainwindow.ui" line="783"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</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>Blende pO2 Kurve ein</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>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="316"/>
         <source>Enable MOD</source>
         <translation>MOD einschalten</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>Vom TC ausgelesene tiefste Deko-Stopps anzeigen</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>Berechnete tiefste Deko-Stopps anzeigen</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>Berechnete tiefste Deko-Stopps in 3m Schritten anzeigen</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>Berechne alle Gewebe</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>Zeige SAC Rate</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>Lineal Ein-/Ausblenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="731"/>
-        <source>Preferences</source>
-        <translation>Einstellungen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="745"/>
+        <location filename="../qt-ui/mainwindow.ui" line="802"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="756"/>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="774"/>
-        <source>Add Dive</source>
-        <translation>Tauchgang hinzufügen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="793"/>
-        <source>Auto Group</source>
-        <translation>Automatisch gruppieren</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="809"/>
+        <location filename="../qt-ui/mainwindow.ui" line="866"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="817"/>
+        <location filename="../qt-ui/mainwindow.ui" line="874"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <location filename="../qt-ui/mainwindow.ui" line="882"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="833"/>
+        <location filename="../qt-ui/mainwindow.ui" line="890"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="838"/>
-        <source>Prev DC</source>
-        <translation>Vorh. TC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="841"/>
+        <location filename="../qt-ui/mainwindow.ui" line="898"/>
         <source>Left</source>
         <translation>Links</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="846"/>
-        <source>Next DC</source>
-        <translation>Nächster TC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="849"/>
+        <location filename="../qt-ui/mainwindow.ui" line="906"/>
         <source>Right</source>
         <translation>Rechts</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="854"/>
-        <source>Select Events</source>
-        <translation>Ereignisse auswählen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <location filename="../qt-ui/mainwindow.ui" line="916"/>
         <source>Input Plan</source>
         <translation>Plan eingeben</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="864"/>
-        <source>About Subsurface</source>
-        <translation>Über Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="875"/>
+        <location filename="../qt-ui/mainwindow.ui" line="932"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="883"/>
+        <location filename="../qt-ui/mainwindow.ui" line="940"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="896"/>
-        <source>Import Log Files</source>
-        <translation>Importiere Log-Dateien</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="899"/>
+        <location filename="../qt-ui/mainwindow.ui" line="956"/>
         <source>Import divelog files from other applications</source>
         <translation>Importiere Tauchlogdateien aus anderen Anwendungen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="915"/>
+        <location filename="../qt-ui/mainwindow.ui" line="964"/>
+        <source>Import &amp;from Divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="972"/>
         <source>&amp;Full Screen</source>
         <translation>&amp;Vollbild</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>Vollbild Umschalten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <location filename="../qt-ui/mainwindow.ui" line="978"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="174"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
         <source>Open File</source>
         <translation>Datei öffnen</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>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor das Logbuch geschlossen werden kann.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="330"/>
-        <source>Please save or cancel the current dive edit before trying to plan a dive.</source>
-        <translation>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor ein neuer Tauchplan bearbeitet werden kann.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="396"/>
+        <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>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor ein neuer Tauchgang hinzugefügt werden kann.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="645"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="419"/>
+        <source>Print runtime table</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="710"/>
         <source>Do you want to save the changes you made in the file %1?</source>
         <translation>Möchtest Du die Änderungen in der Datei %1 speichern?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="647"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="712"/>
         <source>Do you want to save the changes you made in the datafile?</source>
         <translation>Möchtest Du die Änderungen in der Daten-Datei speichern?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="652"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="717"/>
         <source>Save Changes?</source>
         <translation>Änderungen speichern?</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>Änderungen gehen verloren wenn Du sie nicht speicherst.</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>Datei speichern unter</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>Warnung</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>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor ein neues Logbuch geöffnet werden kann.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="280"/>
-        <source>Export UDDF File as</source>
-        <translation>Exportiere CSV Datei als</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="281"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>UDDF Dateien (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="289"/>
-        <source>Export CSV File as</source>
-        <translation>Exportiere CSV Datei als</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="290"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>CSV Dateien (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="299"/>
-        <source>Export World Map</source>
-        <translation>Weltkarte exportieren</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="300"/>
-        <source>HTML files (*.html)</source>
-        <translation>HTML Dateien (*.html)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="449"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="514"/>
         <source>Yearly Statistics</source>
         <translation>Jahresstatistiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="961"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1076"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1199"/>
         <source>Open Dive Log File</source>
         <translation>Öffne Tauchlog Datei</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <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>Tauchlog Dateien (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML Dateien (*.xml);;UDDF/UDCF Dateien(*.uddf *.udcf);;JDiveLog Dateien(*.jlb);;Suunto Dateien(*.sde *.db);;CSV Files(*.csv);;Alle Dateien(*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1225"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Bitte zuerst die aktuelle Bearbeitung abschliessen um eine Neue zu beginnen.</translation>
     </message>
 </context>
 <context>
+    <name>PlannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Last stop at 20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="416"/>
+        <source>Last stop at 6m</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>PreferencesDialog</name>
     <message>
         <location filename="../qt-ui/preferences.ui" line="85"/>
@@ -1824,247 +1927,297 @@ Bitte entferne diese zuerst.</translation>
         <translation>Sprache</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="151"/>
         <source>Lists and Tables</source>
         <translation>Listen und Tabellen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font</source>
         <translation>Schriftart</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="167"/>
         <source>Font size</source>
         <translation>Schriftgrösse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="170"/>
+        <location filename="../qt-ui/preferences.ui" line="180"/>
         <source>Dives</source>
         <translation>Tauchgänge</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>Standard Tauch Datei</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="188"/>
+        <location filename="../qt-ui/preferences.ui" line="198"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="197"/>
+        <location filename="../qt-ui/preferences.ui" line="207"/>
         <source>Display Invalid</source>
         <translation>Zeige auch ungültige?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="214"/>
+        <location filename="../qt-ui/preferences.ui" line="224"/>
         <source>Default Cylinder</source>
         <translation>Standardflasche</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>Wähle Deine Standardflasche(n)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <location filename="../qt-ui/preferences.ui" line="247"/>
         <source>Animations</source>
         <translation>Animationen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <location filename="../qt-ui/preferences.ui" line="253"/>
         <source>Speed</source>
         <translation>Geschwindigkeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="270"/>
+        <location filename="../qt-ui/preferences.ui" line="280"/>
         <source>Subsurface Webservice</source>
         <translation>Subsurface Webservice</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>Standard Benutzer-Kennung</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>Benutzer-Kennung lokal speichern?</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="312"/>
+        <source>Reset all settings to their default value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="348"/>
         <source>Metric</source>
         <translation>Metrisch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="333"/>
+        <location filename="../qt-ui/preferences.ui" line="358"/>
         <source>Imperial</source>
         <translation>Zöllig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="343"/>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
         <source>Personalize</source>
         <translation>Personalisieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="392"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="374"/>
+        <location filename="../qt-ui/preferences.ui" line="399"/>
         <source>meter</source>
         <translation>Meter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="409"/>
         <source>feet</source>
         <translation>Fuss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="401"/>
+        <location filename="../qt-ui/preferences.ui" line="426"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="411"/>
+        <location filename="../qt-ui/preferences.ui" line="436"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="428"/>
+        <location filename="../qt-ui/preferences.ui" line="453"/>
         <source>liter</source>
         <translation>Liter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="438"/>
+        <location filename="../qt-ui/preferences.ui" line="463"/>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="455"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>celsius</source>
         <translation>Celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="465"/>
+        <location filename="../qt-ui/preferences.ui" line="490"/>
         <source>fahrenheit</source>
         <translation>Fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="482"/>
+        <location filename="../qt-ui/preferences.ui" line="507"/>
         <source>kg</source>
         <translation>kg</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>Schwellenwert bei pO₂ Anzeige</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>Schwellenwert bei pN₂ Anzeige</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>Schwellenwert bei pHe Anzeige</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="636"/>
-        <source>max ppO₂ when showing MOD</source>
-        <translation>max ppO₂ bei MOD Anzeige</translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="811"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="817"/>
+        <source>Proxy type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="830"/>
+        <source>Host</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="657"/>
+        <location filename="../qt-ui/preferences.ui" line="856"/>
+        <source>Port</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="882"/>
+        <source>Requires authentication</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="925"/>
+        <source>Password</source>
+        <translation>Passwort</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="682"/>
         <source>draw dive computer reported ceiling red</source>
         <translation>Zeichne Auftauchgrenze des Tauchcomputers in rot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="747"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>System Default</source>
         <translation>Systemeinstellungen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="767"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="419"/>
         <source>Pressure</source>
         <translation>Druck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="421"/>
+        <location filename="../qt-ui/preferences.ui" line="446"/>
         <source>Volume</source>
         <translation>Volumen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="448"/>
+        <location filename="../qt-ui/preferences.ui" line="473"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="475"/>
+        <location filename="../qt-ui/preferences.ui" line="500"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="517"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="507"/>
+        <location filename="../qt-ui/preferences.ui" line="532"/>
         <source>Time units</source>
         <translation>Zeiteinheiten</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>Zeiteinheit für Geschwindigkeit bei Aufstieg/Abstieg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="520"/>
+        <location filename="../qt-ui/preferences.ui" line="545"/>
         <source>Minutes</source>
         <translation>Minuten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="530"/>
+        <location filename="../qt-ui/preferences.ui" line="555"/>
         <source>Seconds</source>
         <translation>Sekunden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="562"/>
+        <location filename="../qt-ui/preferences.ui" line="587"/>
         <source>Show</source>
         <translation>Anzeigen</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="693"/>
         <source>Show non-used cylinders in Equipment Tab</source>
         <translation>Nicht benutzte Flaschen unter Ausrüstung anzeigen</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>Durchschnittstiefe anzeigen</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>GF low bei maximaler Tiefe anwenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="691"/>
+        <location filename="../qt-ui/preferences.ui" line="716"/>
         <source>Misc</source>
         <translation>Sonstiges</translation>
     </message>
@@ -2074,35 +2227,65 @@ Bitte entferne diese zuerst.</translation>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="697"/>
+        <location filename="../qt-ui/preferences.ui" line="722"/>
         <source>GFLow</source>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="739"/>
         <source>GFHigh</source>
         <translation>GF high</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="24"/>
+        <source>System proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="25"/>
+        <source>HTTP proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="26"/>
+        <source>SOCKS proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="245"/>
         <source>Restart required</source>
         <translation>Bitte Programm neu starten</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>Um die neue Sprache laden zu können, muss Subsurface neu gestartet werden.</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>Standard Logfile öffnen</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>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="394"/>
+        <source>Warning</source>
+        <translation>Warnung</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"/>
+    </message>
 </context>
 <context>
     <name>PrintDialog</name>
@@ -2152,7 +2335,7 @@ Bitte entferne diese zuerst.</translation>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Buddy</source>
-        <translation>Partner</translation>
+        <translation>Buddy</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="31"/>
@@ -2243,72 +2426,72 @@ Bitte entferne diese zuerst.</translation>
 <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>unbekannt</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>Tauchgang Nr %1 - %2</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>max Tiefe: %1 %2</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>Dauer: %1 Minuten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1918"/>
+        <location filename="../qt-ui/models.cpp" line="1898"/>
         <source>Gas Used:</source>
         <translation>Verw. Gas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1920"/>
+        <location filename="../qt-ui/models.cpp" line="1900"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1922"/>
+        <location filename="../qt-ui/models.cpp" line="1902"/>
         <source>Max. CNS:</source>
         <translation>Max. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1924"/>
+        <location filename="../qt-ui/models.cpp" line="1904"/>
         <source>Weights:</source>
         <translation>Blei:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1929"/>
+        <location filename="../qt-ui/models.cpp" line="1909"/>
         <source>Notes:</source>
         <translation>Notizen:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1936"/>
+        <location filename="../qt-ui/models.cpp" line="1916"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1938"/>
+        <location filename="../qt-ui/models.cpp" line="1918"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1940"/>
+        <location filename="../qt-ui/models.cpp" line="1920"/>
         <source>Suit:</source>
         <translation>Anzug:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1942"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>Viz:</source>
         <translation>Sicht:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1944"/>
+        <location filename="../qt-ui/models.cpp" line="1924"/>
         <source>Rating:</source>
         <translation>Bewertung:</translation>
     </message>
@@ -2316,62 +2499,77 @@ Bitte entferne diese zuerst.</translation>
 <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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/>
+        <source>Make first divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="906"/>
+        <source>Delete this divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="913"/>
         <source>Add Gas Change</source>
         <translation>Gaswechsel setzen</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>Markierung setzen</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>Entferne Ereigniss</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>Ähnliche Ereignisse ausblenden</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>Name bearbeiten</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>Alle Ereignisse einblenden</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>Ereignisse ausblenden</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>Alle %1 Ereignisse ausblenden?</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>Ausgewähltes Ereignis entfernen?</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>%1 @ %2:%3</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>Name der Markierung bearbeiten</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>Benutzerdefinierter Name:</translation>
     </message>
@@ -2379,12 +2577,12 @@ Bitte entferne diese zuerst.</translation>
 <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>Luft</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>Diesen Punkt entfernen</translation>
     </message>
@@ -2394,22 +2592,22 @@ Bitte entferne diese zuerst.</translation>
         <translation>Schliessen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="34"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation>Ø</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="37"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation>Min.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="40"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation>Max.</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>Karte verschieben und mit Doppelklick Tauchplatz markieren</translation>
     </message>
@@ -2423,9 +2621,23 @@ Bitte entferne diese zuerst.</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="128"/>
         <source>New starting number</source>
         <translation>Neue erste Nummer</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="126"/>
+        <source>New number</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchBar</name>
+    <message>
+        <location filename="../qt-ui/searchbar.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ShiftImageTimesDialog</name>
@@ -2440,42 +2652,47 @@ Bitte entferne diese zuerst.</translation>
         <translation>Ausgewählte Zeiten von Bild(ern) verschieben um...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="102"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="95"/>
+        <source>h:mm</source>
+        <translation>h:mm</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="105"/>
         <source>earlier</source>
         <translation>früher</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="109"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="112"/>
         <source>later</source>
         <translation>später</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>Um den Zeitversatz zwischen der Uhrzeit des Tauchcomputers und der Kamera zu berechnen machen sie einfach ein Bild ihres Tauchcomputers mit der Kamera. Laden sie dieses Bild in den Computer und drücken diesen Knopf.</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>Versatz der Kamerazeit festlegen</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>Wähle Bild des Tauchcomputers das die Zeit zeigt</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>Welche/s Datum/Zeit werden im Bild angezeigt?</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>Öffne Bilddateien</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>Bilddateien (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2555,42 +2772,42 @@ Bitte entferne diese zuerst.</translation>
 <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>Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/>
         <source>Connecting...</source>
         <translation>Verbinde...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="421"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="419"/>
         <source>Download finished</source>
         <translation>Herunterladen beendet</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>Fehler beim Herunterladen: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/>
         <source>Connection Error: </source>
         <translation>Verbindungsfehler: </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>Ungültige Benutzerkennung</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>Verstehe die Antwort nicht!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/>
         <source>Download Success!</source>
         <translation>Erfolgreich geladen!</translation>
     </message>
@@ -2606,17 +2823,17 @@ Bitte entferne diese zuerst.</translation>
 <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>Beschreibung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2624,7 +2841,7 @@ Bitte entferne diese zuerst.</translation>
 <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>Information</translation>
     </message>
@@ -2632,42 +2849,42 @@ Bitte entferne diese zuerst.</translation>
 <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>Neue Version suchen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="37"/>
-        <source>&lt;h3&gt;Subsurface was unable to check for updates.&lt;/h3&gt;</source>
-        <translation>&lt;h3&gt;Subsurface konnte nicht nach neuen Versionen suchen.&lt;/h3&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="36"/>
+        <source>Subsurface was unable to check for updates.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
-        <source>&lt;br/&gt;&lt;b&gt;The following error occurred:&lt;/b&gt;&lt;br/&gt;</source>
-        <translation>&lt;br/&gt;&lt;b&gt;Folgende Fehlermeldung erhalten:&lt;/b&gt;&lt;br/&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="41"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="43"/>
-        <source>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Please check your internet connection.&lt;/b&gt;</source>
-        <translation>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Bitte Internet Verbindung Überprüfen.&lt;/b&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
     </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>Dies ist die aktuelle Subsurface Version</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>Eine neuere Subsurface Version kann hier heruntergeladen werden&lt;br/&gt;&lt;a href=&quot;%1&quot;&lt;/a&gt;</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>&lt;b&gt;Eine neue Subsurface Version wurde freigegeben.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</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>Während der Suche nach einer neuen Version ist ein Fehler aufgetreten.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -2675,25 +2892,163 @@ Bitte entferne diese zuerst.</translation>
 <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>Benutzerhandbuch</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>Kann das Subsurface Handbuch nicht finden</translation>
     </message>
 </context>
 <context>
+    <name>UserSurvey</name>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="47"/>
+        <source>Subsurface User Survey</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="79"/>
+        <source>Recreational DIver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="92"/>
+        <source>Tech Diver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="105"/>
+        <source>Interested in dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="118"/>
+        <source>I am downloading dives from supported dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="131"/>
+        <source>I am importing dives from other software / sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="144"/>
+        <source>I am manually entering dives</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="190"/>
+        <source>Please type suggestions (in English) in the following box</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="27"/>
+        <source>
+Operating System: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="30"/>
+        <source>
+CPU Architecture: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="35"/>
+        <source>
+OS CPU Architecture %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="39"/>
+        <source>
+Language: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="73"/>
+        <source>Should we ask you later?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="74"/>
+        <source>Don&apos;t ask me again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="75"/>
+        <source>Ask Later</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="76"/>
+        <source>Ask again?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <source>Submit User Survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <source>Subsurface was unable to submit the user survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="101"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="102"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="111"/>
+        <source>Survey successfully submitted.</source>
+        <translation type="unfinished"/>
+    </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>Während der Suche nach einer neuen Version ist ein Fehler aufgetreten.&lt;br/&gt;&lt;br/&gt;%1</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>Beschreibung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="723"/>
+        <location filename="../qt-ui/models.cpp" line="721"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2741,12 +3096,12 @@ Bitte entferne diese zuerst.</translation>
         <translation>Hochladen</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>Die Aktion hat zu lange gedauert</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="279"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="277"/>
         <source>Transfering data...</source>
         <translation>Übertrage Daten...</translation>
     </message>
@@ -2754,37 +3109,37 @@ Bitte entferne diese zuerst.</translation>
 <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>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="368"/>
+        <location filename="../qt-ui/models.cpp" line="373"/>
         <source>Weight</source>
         <translation>Gewicht</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>Hier klicken entfernt dieses Gewichtssystem.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="453"/>
+        <location filename="../qt-ui/models.cpp" line="458"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="454"/>
+        <location filename="../qt-ui/models.cpp" line="459"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="478"/>
+        <location filename="../qt-ui/models.cpp" line="483"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="484"/>
         <source>m</source>
         <translation>m</translation>
     </message>
@@ -2792,79 +3147,79 @@ Bitte entferne diese zuerst.</translation>
 <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>Jahr 
  &gt; Monat / Reise</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1643"/>
         <source>Duration 
  Total</source>
         <translation>Dauer
 Gesamt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>
 Average</source>
         <translation>
 Ø</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>
 Shortest</source>
         <translation>
 Kürzester</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>
 Longest</source>
         <translation>
 Längster</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>Tiefe (%1)
  Durchschnitt</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>
 Minimum</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>
 Maximum</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>SAC (%1)
  Durchschnitt</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>Temp. (%1)
@@ -2874,99 +3229,92 @@ Mittel</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="58"/>
+        <location filename="../dive.c" line="87"/>
         <source>pascal</source>
         <translation>Pa</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>bar</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>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="104"/>
-        <location filename="../qt-gui.cpp" line="292"/>
-        <source>l</source>
-        <translation>l</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>cuft</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>m</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>ft</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>US Pfund</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>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1120"/>
+        <location filename="../dive.c" line="1237"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) oder (%s)</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>Luft</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="170"/>
+        <location filename="../equipment.c" line="210"/>
         <source>integrated</source>
         <translation>integriert</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="171"/>
+        <location filename="../equipment.c" line="211"/>
         <source>belt</source>
         <translation>Gürtel</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="172"/>
+        <location filename="../equipment.c" line="212"/>
         <source>ankle</source>
         <translation>Fussblei</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="173"/>
+        <location filename="../equipment.c" line="213"/>
         <source>backplate weight</source>
         <translation>Backplate-Gewicht</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="174"/>
+        <location filename="../equipment.c" line="214"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -2983,253 +3331,253 @@ Mittel</translation>
         <translation>maximale Anzahl der unterstützten Spalten beim CSV-Import sind %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>none</source>
         <translation>keine</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>deco stop</source>
         <translation>Deko-Stopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ascent</source>
         <translation>Aufstieg</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ceiling</source>
         <translation>tiefster Deko-Stopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>workload</source>
         <translation>Arbeit</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>transmitter</source>
         <translation>Sender</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>violation</source>
         <translation>Verletzung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>bookmark</source>
         <translation>Markierung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>surface</source>
         <translation>Oberfläche</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>safety stop</source>
         <translation>Sicherheitsstopp</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>Gaswechsel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (voluntary)</source>
         <translation>Sicherheitsstopp (freiwillig)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (mandatory)</source>
         <translation>Sicherheitsstopp (obligatorisch)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>deepstop</source>
         <translation>Tiefen-Stopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>ceiling (safety stop)</source>
         <translation>Sicherheits-Stopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>divetime</source>
         <translation>Tauchgangsdauer</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>unterhalb Dekotiefe</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>maxdepth</source>
         <translation>Max. Tiefe</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>PO2</source>
         <translation>PO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>airtime</source>
         <translation>verbleibende Atemzeit</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>heading</source>
         <translation>Richtung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>tissue level warning</source>
         <translation>Gewebewarnung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>non stop time</source>
         <translation>Nullzeit</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="163"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>invalid event number</source>
         <translation>ungültige Ereignisnummer</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>Nicht in der Lage, einen Parser für %s %s zu erstellen</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="411"/>
+        <location filename="../libdivecomputer.c" line="414"/>
         <source>Error registering the data</source>
         <translation>Fehler beim Registrieren der Daten</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="419"/>
+        <location filename="../libdivecomputer.c" line="422"/>
         <source>Error parsing the datetime</source>
         <translation>Fehler beim Lesen des Datums</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="438"/>
         <source>Dive %d: %s %d %04d</source>
         <translation>Tauchgang Nr. %d: %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="440"/>
+        <location filename="../libdivecomputer.c" line="443"/>
         <source>Error parsing the divetime</source>
         <translation>Fehler beim Lesen der Dauer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="449"/>
+        <location filename="../libdivecomputer.c" line="452"/>
         <source>Error parsing the maxdepth</source>
         <translation>Fehler beim Lesen der maximalen Tiefe</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="458"/>
+        <location filename="../libdivecomputer.c" line="461"/>
         <source>Error parsing the gas mix count</source>
         <translation>Fehler beim Lesen der Gasgemischszahl</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="470"/>
+        <location filename="../libdivecomputer.c" line="473"/>
         <source>Error obtaining water salinity</source>
         <translation>Fehler beim Lesen des Salzgehalts</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error obtaining surface pressure</source>
         <translation>Kein Oberflächendruck erhalten</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the gas mix</source>
         <translation>Fehler beim Lesen der Gasgemischs</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="493"/>
+        <location filename="../libdivecomputer.c" line="496"/>
         <source>Error parsing the samples</source>
         <translation>Fehler beim Lesen der Samples</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="623"/>
+        <location filename="../libdivecomputer.c" line="626"/>
         <source>Event: waiting for user action</source>
         <translation>Ereignis: warte auf Benutzeraktion</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>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="691"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the event handler.</source>
         <translation>Fehler beim Registrieren der Ereignisbehandlung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="696"/>
+        <location filename="../libdivecomputer.c" line="699"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Fehler bei der Registrierung der Abbruchbehandlung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="717"/>
+        <location filename="../libdivecomputer.c" line="720"/>
         <source>Dive data import error</source>
         <translation>Fehler beim Importieren der Tauchgangsdaten</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="756"/>
+        <location filename="../libdivecomputer.c" line="759"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Fehler beim Erzeugen des libdivecomputer Contexts</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="763"/>
+        <location filename="../libdivecomputer.c" line="766"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Fehler beim Öffnen von %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="462"/>
+        <location filename="../parse-xml.c" line="466"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Unverständliche Prozentangabe %s
 </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>Fehler beim Lesen von &apos;%s&apos;</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>Datenbank Anfrage &apos;get_events&apos; fehlgeschlagen.
 </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>Datenbank Anfrage &apos;get_tags&apos; fehlgeschlagen.
@@ -3243,111 +3591,160 @@ Mittel</translation>
 </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 '%s'.
 </source>
         <translation>Datenbank Anfrage fehlgeschlagen &apos;%s&apos;.
 </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>Datenbank Anfrage &apos;get_cylinders&apos; fehlgeschlagen.
 </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>Datenbank Anfrage &apos;get_changes&apos; fehlgeschlagen.
 </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>Datenbank Anfrage &apos;get_profile_sample&apos; fehlgeschlagen.
 </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>Kann Stylesheet %s nicht öffnen</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>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="146"/>
-        <location filename="../planner.c" line="617"/>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation>Kann Gasgemisch %d/%d nicht finden</translation>
+        <location filename="../planner.c" line="159"/>
+        <location filename="../planner.c" line="752"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="308"/>
+        <location filename="../planner.c" line="345"/>
         <source>Too many gas mixes</source>
         <translation>Zu viele Gasgemische</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="489"/>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation>%s
-Subsurface Tauchplan
-basierend auf GFlow = %.0f und GFhigh = %.0f
-
-</translation>
+        <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>HAFTUNGSAUSSCHLUSS / WARNUNG: DIES IST EINE NEUE IMPLEMENTATION DES BÜHLMANN-ALGORITHMUS UND EINES DARAUF BASIERENDEN TAUCHPLANERS, DIE NUR EINGESCHRÄNKT GETESTET WURDE. WIR RATEN DRINGENST, KEINE TAUCHGÄNGE DURCHZUFÜHREN, DIE NUR AUF DEN HIER ERSTELLTEN DATEN BERUHEN.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="530"/>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Tauchen auf %.*f %s in %d:%02d min - Gesamtzeit %d:%02u mit %s
-</translation>
+        <location filename="../planner.c" line="535"/>
+        <source>based on GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="539"/>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Verbleibe auf %.*f %s für %d:%02d min - Gesamtzeit %d:%02u mit %s
-</translation>
+        <location filename="../planner.c" line="538"/>
+        <source>Subsurface dive plan</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="550"/>
-        <source>Switch gas to %s
-</source>
-        <translation>Gaswechsel zu %s
-</translation>
+        <location filename="../planner.c" line="542"/>
+        <source>depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="558"/>
-        <source>Gas consumption:
-</source>
-        <translation>Gasverbrauch:
-</translation>
+        <location filename="../planner.c" line="545"/>
+        <source>runtime</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="569"/>
-        <source>%.0f%s of %s
-</source>
-        <translation>%.0f%s %s
-</translation>
+        <location filename="../planner.c" line="548"/>
+        <source>duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="551"/>
+        <source>gas</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="606"/>
+        <source>%3.0f%s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
+        <source>%3dmin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="629"/>
+        <source>Switch gas to %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="638"/>
+        <source>Gas consumption:</source>
+        <translation type="unfinished"/>
+    </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"/>
     </message>
     <message>
-        <location filename="../planner.c" line="810"/>
+        <location filename="../planner.c" line="659"/>
+        <source>this is more gas than available in the specified cylinder!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="664"/>
+        <source>not enough reserve for gas sharing on ascent!</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="668"/>
+        <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="980"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1226"/>
+        <location filename="../profile.c" line="1250"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3356,70 +3753,69 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1229"/>
+        <location filename="../profile.c" line="1253"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1233"/>
+        <location filename="../profile.c" line="1257"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1263"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </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>SAC: %2.1fl/min
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1244"/>
+        <location filename="../profile.c" line="1268"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1246"/>
+        <location filename="../profile.c" line="1270"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1272"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="1274"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="1277"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1260"/>
+        <location filename="../profile.c" line="1284"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3428,7 +3824,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1264"/>
+        <location filename="../profile.c" line="1288"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3437,402 +3833,395 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1276"/>
+        <location filename="../profile.c" line="1300"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Sicherheitsstop: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1279"/>
+        <location filename="../profile.c" line="1303"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Sicherheitsstop: unbek. Zeit @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="1308"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
+        <location filename="../profile.c" line="1311"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deko: unbek. Zeit @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1291"/>
+        <location filename="../profile.c" line="1315"/>
         <source>In deco
 </source>
         <translation>In Deko
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1293"/>
+        <location filename="../profile.c" line="1317"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1297"/>
+        <location filename="../profile.c" line="1321"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1305"/>
+        <location filename="../profile.c" line="1329"/>
         <source>In deco (calc)
 </source>
         <translation>Deko (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1307"/>
+        <location filename="../profile.c" line="1331"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1310"/>
+        <location filename="../profile.c" line="1334"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1313"/>
+        <location filename="../profile.c" line="1337"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Berechneter tiefster Deko-Stopp %.0f %s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1319"/>
+        <location filename="../profile.c" line="1343"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Gewebe %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1325"/>
+        <location filename="../profile.c" line="1349"/>
         <source>heartbeat: %d
 </source>
         <translation>Herzschlag: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1327"/>
+        <location filename="../profile.c" line="1351"/>
         <source>bearing: %d
 </source>
         <translation>Peilung: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1419"/>
+        <location filename="../profile.c" line="1443"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</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>%s %sTiefe:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1435"/>
+        <location filename="../profile.c" line="1459"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sTiefe:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1439"/>
+        <location filename="../profile.c" line="1463"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</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>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1454"/>
+        <location filename="../profile.c" line="1478"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sDruck:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="273"/>
+        <location filename="../qt-gui.cpp" line="281"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="276"/>
+        <location filename="../qt-gui.cpp" line="284"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="392"/>
-        <source>%1, %2 %3, %4 %5:%6</source>
-        <translation>%1, %2 %3, %4 %5:%6</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="405"/>
-        <source>%1 %2, %3
-%4:%5</source>
-        <translation>%1 %2, %3
-%4:%5</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="418"/>
+        <location filename="../qt-gui.cpp" line="417"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 Tauchgänge)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="423"/>
+        <location filename="../qt-gui.cpp" line="422"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 Tauchgang)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>boat</source>
         <translation>Boot</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>shore</source>
         <translation>Ufer</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>drift</source>
         <translation>Strömung</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>deep</source>
         <translation>tief</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>cavern</source>
         <translation>Kaverne</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>ice</source>
         <translation>Eis</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>wreck</source>
         <translation>Wrack</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>cave</source>
         <translation>Höhle</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>altitude</source>
         <translation>Berg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>pool</source>
         <translation>Pool</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>lake</source>
         <translation>See</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>river</source>
         <translation>Fluss</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>night</source>
         <translation>Nacht</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>fresh</source>
         <translation>süss</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>student</source>
         <translation>Schüler</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>photo</source>
         <translation>Foto</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>video</source>
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>instructor</source>
         <translation>Instruktor</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="25"/>
         <source>deco</source>
         <translation>deko</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="216"/>
+        <location filename="../dive.c" line="133"/>
+        <source>ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="214"/>
         <source>more than %d days</source>
         <translation>mehr als %d Tage</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="220"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="224"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="235"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation>für Tauchgänge Nr.</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="242"/>
+        <location filename="../statistics.c" line="240"/>
         <source>for selected dives</source>
         <translation>für die ausgewählten Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="275"/>
         <source>for dive #%d</source>
         <translation>für Tauchgang Nr. %d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for selected dive</source>
         <translation>für den ausgewählten Tauchgang</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for all dives</source>
         <translation>für alle Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="283"/>
+        <location filename="../statistics.c" line="281"/>
         <source>(no dives)</source>
         <translation>(keine Tauchgänge)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sun</source>
         <translation>So</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Mon</source>
         <translation>Mo</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Tue</source>
         <translation>Di</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Wed</source>
         <translation>Mi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Thu</source>
         <translation>Do</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Fri</source>
         <translation>Fr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sat</source>
         <translation>Sa</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Mar</source>
         <translation>Mär</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Dec</source>
         <translation>Dez</translation>
     </message>
@@ -3862,97 +4251,97 @@ Is the Uemis Zurich plugged in correctly?</source>
 Ist der Uemis Zürich korrekt verbunden?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="107"/>
+        <location filename="../uemis-downloader.c" line="111"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="379"/>
+        <location filename="../uemis-downloader.c" line="383"/>
         <source>Reading %s %s</source>
         <translation>Lese %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="399"/>
+        <location filename="../uemis-downloader.c" line="403"/>
         <source>data</source>
         <translation>Daten</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="420"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>divelog entry id</source>
         <translation>Logbucheintrag mit ID</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="422"/>
+        <location filename="../uemis-downloader.c" line="426"/>
         <source>divespot data id</source>
         <translation>Tauchplatz Daten ID</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
+        <location filename="../uemis-downloader.c" line="428"/>
         <source>more data dive id</source>
         <translation>mehr Daten für Tauchgang ID</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>wetsuit</source>
         <translation>Nass-Tauchanzug</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>semidry</source>
         <translation>halbtrocken</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>drysuit</source>
         <translation>Trockentauchanzug</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>shorty</source>
         <translation>Shorty</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>vest</source>
         <translation>Weste</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>long john</source>
         <translation>Latzhose</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>jacket</source>
         <translation>Jacke</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>full suit</source>
         <translation>vollständiger Tauchanzug</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>2 pcs full suit</source>
         <translation>Zweiteiler</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="620"/>
+        <location filename="../uemis-downloader.c" line="624"/>
         <source>membrane</source>
         <translation>Membran</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="802"/>
+        <location filename="../uemis-downloader.c" line="823"/>
         <source>Init Communication</source>
         <translation>Verbindung aufbauen</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="804"/>
+        <location filename="../uemis-downloader.c" line="825"/>
         <source>Uemis init failed</source>
         <translation>Uemis-Initialisierung fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="815"/>
+        <location filename="../uemis-downloader.c" line="836"/>
         <source>Start download</source>
         <translation>Beginne zu Laden</translation>
     </message>
@@ -3973,18 +4362,18 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="203"/>
-        <source>PO2 Green Warning</source>
-        <translation>Warnung: PO₂ Grün</translation>
+        <source>pO₂ Green Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
-        <source>PO2 Ascend Warning</source>
-        <translation>Warnung: Aufstieg / PO₂</translation>
+        <source>pO₂ Ascend Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="208"/>
-        <source>PO2 Ascend Alarm</source>
-        <translation>Alarm: Aufstieg / PO₂</translation>
+        <source>pO₂ Ascend Alarm</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
@@ -4046,5 +4435,214 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
         <source>Low Battery Alert</source>
         <translation>Alarm: Batterie schwach</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"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="36"/>
+        <source>Date:</source>
+        <translation>Datum:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="38"/>
+        <source>Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="40"/>
+        <source>Duration:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="41"/>
+        <source>min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="43"/>
+        <source>Max Depth:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="46"/>
+        <source>Air Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="48"/>
+        <source>Water Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="50"/>
+        <source>Location:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="54"/>
+        <source>Notes:</source>
+        <translation>Notizen:</translation>
+    </message>
+</context>
+<context>
+    <name>plannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="35"/>
+        <source>Rates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="56"/>
+        <source>Ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="77"/>
+        <source>below 75% avg. depth</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="94"/>
+        <source>75%-50% avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="111"/>
+        <source>50% avg. depth - 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="128"/>
+        <source>6m/20ft to surface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="148"/>
+        <source>Descent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="200"/>
+        <source>surface to the bottom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="226"/>
+        <source>Planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="247"/>
+        <source>GF low</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="264"/>
+        <source>GF high</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
+        <source>Drop to first depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
+        <source>Last Stop at 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>plan backgas breaks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="318"/>
+        <source>Gas Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <source>bottom SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="349"/>
+        <source>deco SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="359"/>
+        <source>bottom pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="389"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="382"/>
+        <source>deco pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="421"/>
+        <source>Dive Notes</source>
+        <translation>Notizen</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="445"/>
+        <source>display runtime</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="458"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="461"/>
+        <source>display segment duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="471"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="474"/>
+        <source>display transitions in deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="481"/>
+        <source>verbatim diveplan</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_de_DE.ts b/translations/subsurface_de_DE.ts
index 066a0711b..31ce5fa40 100644
--- a/translations/subsurface_de_DE.ts
+++ b/translations/subsurface_de_DE.ts
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="de_DE" version="2.0">
+<defaultcodec>UTF-8</defaultcodec>
 <context>
     <name>CylindersModel</name>
     <message>
@@ -9,7 +10,7 @@
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Size</source>
-        <translation>Größe</translation>
+        <translation>Grösse</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
@@ -37,42 +38,42 @@
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="71"/>
+        <location filename="../qt-ui/models.cpp" line="70"/>
         <source>Switch at</source>
         <translation>Wechsel bei</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>Hier klicken entfernt diese Flasche.</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>Flasche kann nicht entfernt werden</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>Dieses Gas wird verwendet. Nur Flaschen die nicht im Tauchgang verwendet werden können entfernt werden.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="507"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="508"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="527"/>
+        <location filename="../qt-ui/models.cpp" line="532"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="528"/>
+        <location filename="../qt-ui/models.cpp" line="533"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -87,7 +88,7 @@
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
         <source>Remove the selected Dive Computer?</source>
-        <translation>Ausgewählten Tauchcomputer entfernen?</translation>
+        <translation>Den ausgewählten Tauchcomputer entfernen?</translation>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/>
@@ -99,22 +100,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>Modell</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Device ID</source>
         <translation>Gerätebezeichnung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Nickname</source>
         <translation>Gerätename</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>Hier klicken entfernt diesen Tauchcomputer.</translation>
     </message>
@@ -122,190 +123,326 @@
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="90"/>
-        <source>air</source>
-        <translation>Luft</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="92"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</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>Notausstieg mit offenem System</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> Anfang</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> Ende</translation>
     </message>
 </context>
 <context>
-    <name>DiveGasPressureItem</name>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="475"/>
-        <source>air</source>
-        <translation>Luft</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="476"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-</context>
-<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1258"/>
-        <source> l/min</source>
-        <translation> l/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
-        <source> cuft/min</source>
-        <translation> cuft/min</translation>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <source>/min</source>
+        <translation>/min</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>Suchfeld anzeigen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="706"/>
         <source>expand all</source>
         <translation>Alle ausklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="740"/>
+        <location filename="../qt-ui/divelistview.cpp" line="707"/>
         <source>collapse all</source>
         <translation>Alle einklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="741"/>
+        <location filename="../qt-ui/divelistview.cpp" line="708"/>
         <source>collapse others</source>
         <translation>Andere einklappen</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>Entferne Tauchgang aus Reise</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>Neue Reise darüber einfügen</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>Tauchgäng(e) zur Reise darüber hinzufügen</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>Tauchgäng(e) zur Reise darunter hinzufügen</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>Reise mit Reise darüber verbinden</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>Reise mit Reise darunter verbinden</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>Tauchgang löschen</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>Tauchgang(gänge) als ungültig kennzeichnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
-        <source>save As</source>
-        <translation>Speichern unter</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="763"/>
-        <source>export As UDDF</source>
-        <translation>Als UDDF exportieren</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="764"/>
-        <source>export As CSV</source>
-        <translation>Als CSV exportieren</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="744"/>
+        <source>renumber dive(s)</source>
+        <translation>Nummeriere Tauchgänge neu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="765"/>
+        <location filename="../qt-ui/divelistview.cpp" line="745"/>
         <source>shift times</source>
         <translation>Zeiten verschieben</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="766"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>load images</source>
         <translation>lade Bilder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="769"/>
-        <source>upload dive(s) to divelogs.de</source>
-        <translation>Tauchgang(gänge) auf divelogs.de hochladen</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Open Image Files</source>
+        <translation>Öffne Bilddateien</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation>Bilddateien (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <source>merge selected dives</source>
+        <translation>Ausgewählte Tauchgänge zusammenführen</translation>
+    </message>
+</context>
+<context>
+    <name>DiveLogExportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
+        <source>Export Dive Log Files</source>
+        <translation>Exportiere Tauchlog Dateien</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="24"/>
+        <source>General Export</source>
+        <translation>Allgemeiner Export</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="30"/>
+        <source>Export format</source>
+        <translation>Export Format</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="42"/>
+        <source>Subsurface XML</source>
+        <translation>Subsurface XML</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="61"/>
+        <source>UDDF</source>
+        <translation>UDDF</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="74"/>
+        <source>divelogs.de</source>
+        <translation>divelogs.de</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="84"/>
+        <source>CSV</source>
+        <translation>CSV</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="94"/>
+        <source>Worldmap</source>
+        <translation>Weltkarte</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="107"/>
+        <source>Selection</source>
+        <translation>Auswahl</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="116"/>
+        <source>Selected dives</source>
+        <translation>Ausgewählte Tauchgänge</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="126"/>
+        <source>All dives</source>
+        <translation>Alle Tauchgänge</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="178"/>
+        <source>HTML</source>
+        <translation>HTML</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="184"/>
+        <source>General Settings</source>
+        <translation>Allg. Einstellungen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="190"/>
+        <source>Subsurface Numbers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="203"/>
+        <source>Selected Dives</source>
+        <translation>Ausgewählte Tauchgänge</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="216"/>
+        <source>Minimum Javascript</source>
+        <translation>Minimum Javascript</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="229"/>
+        <source>All Dives</source>
+        <translation>Alle Tauchgänge</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="239"/>
+        <source>Export List only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="252"/>
+        <source>Style Options</source>
+        <translation>Stiloptionen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="264"/>
+        <source>Font</source>
+        <translation>Schriftart</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="274"/>
+        <source>Font size</source>
+        <translation>Schriftgrösse</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
+        <source>8</source>
+        <translation>8</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="795"/>
-        <source>Save Dives As...</source>
-        <translation>Speichere Tauchgänge als...</translation>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <source>10</source>
+        <translation>10</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="814"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <source>12</source>
+        <translation>12</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <source>14</source>
+        <translation>14</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <source>16</source>
+        <translation>16</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <source>18</source>
+        <translation>18</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <source>20</source>
+        <translation>20</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="323"/>
+        <source>Theme</source>
+        <translation>Motiv</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
+        <source>Light</source>
+        <translation>Licht</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <source>Sand</source>
+        <translation>Sand</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="153"/>
         <source>Export UDDF File as</source>
         <translation>UDDF Datei exportieren als</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>UDDF Dateien (*.uddf *.UDDF)</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>CSV Datei exportieren als</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>CSV Dateien (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Open Image Files</source>
-        <translation>Öffne Bilddateien</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="162"/>
+        <source>Export World Map</source>
+        <translation>Weltkarte exportieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
-        <translation>Bilddateien (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="163"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="177"/>
+        <source>HTML files (*.html)</source>
+        <translation>HTML Dateien (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="760"/>
-        <source>merge selected dives</source>
-        <translation>Ausgewählte Tauchgänge zusammenführen</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="167"/>
+        <source>Export Subsurface XML</source>
+        <translation>Exportiere Subsurface XML</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="168"/>
+        <source>XML files (*.xml *.ssrf)</source>
+        <translation>XML Dateien (*.xml, *.ssrf)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="176"/>
+        <source>Export HTML files as</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -316,138 +453,133 @@
         <translation>Importiere Tauchlog Datei</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="36"/>
-        <source>Import CSV Dive Log Files</source>
-        <translation>Importiere CSV Tauchlog Datei</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="50"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
         <source>CSV options</source>
         <translation>CSV Optionen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="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>Feld Trenner</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>Vorkonfigurierte Importe</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>Feldkonfiguration</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="80"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="100"/>
         <source>Stopdepth</source>
         <translation>Stopptiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="107"/>
         <source>PO2</source>
         <translation>PO₂</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>Zeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="121"/>
         <source>Temp</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="151"/>
         <source>Cns</source>
         <translation>CNS</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>Einheiten</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>Metrisch</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>Zöllig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="248"/>
         <source>Manual dives</source>
         <translation>Manuelle Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="283"/>
         <source>Dive #</source>
         <translation>Tauchgang Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="317"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="385"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="470"/>
         <source>Tags</source>
         <translation>Stichworte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
         <source>Location</source>
         <translation>Ort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="453"/>
         <source>Gps</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="300"/>
         <source>Max depth</source>
         <translation>Max. Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="334"/>
         <source>Mean depth</source>
         <translation>Mittlere Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="368"/>
         <source>Buddy</source>
         <translation>Partner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="402"/>
         <source>Notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="436"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
@@ -455,105 +587,70 @@
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="71"/>
-        <source>Bottom SAC</source>
-        <translation>AMV</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="106"/>
+        <source>Planned Dive Time</source>
+        <translation>Geplante Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="85"/>
-        <source>SAC on DECO Stop</source>
-        <translation>Deko-AMV</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="134"/>
+        <source>Altitude</source>
+        <translation>Höhe ünN</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="78"/>
-        <source>GFHigh</source>
-        <translation>GF high</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="98"/>
-        <source>GFLow</source>
-        <translation>GF low</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="125"/>
-        <source>Last Stop at 6m</source>
-        <translation>Letzter Stopp auf 6m</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="174"/>
-        <source>Start Time</source>
-        <translation>Startzeit</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="181"/>
+        <location filename="../qt-ui/diveplanner.ui" line="141"/>
         <source>ATM Pressure</source>
         <translation>Oberflächendruck</translation>
     </message>
-</context>
-<context>
-    <name>DivePlannerGraphics</name>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="114"/>
-        <source>10m</source>
-        <translation>10m</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="116"/>
-        <source>30ft</source>
-        <translation>30ft</translation>
-    </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="363"/>
-        <source>Handler Position Error</source>
-        <translation>Problematische Position des Knotens</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="148"/>
+        <source>mbar</source>
+        <translation>mbar</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>
-        <translation>Einer oder mehrere Deiner Stopps werden hierdurch verloren gehen.
-Bitte entferne diese zuerst.</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="158"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="445"/>
-        <source>AIR</source>
-        <translation>Luft</translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="137"/>
+        <source>unknown</source>
+        <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1148"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="586"/>
         <source>Final Depth</source>
         <translation>Endtiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1150"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="588"/>
         <source>Run time</source>
         <translation>Laufzeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1152"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="590"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1154"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="592"/>
         <source>Used Gas</source>
         <translation>Gasverbrauch</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>CC Set Point</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>Plan verwerfen?</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>Du bist dabei Deinen Plan zu verwerfen.</translation>
     </message>
@@ -561,17 +658,17 @@ Bitte entferne diese zuerst.</translation>
 <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>Planerpunkte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="256"/>
         <source>Available Gases</source>
         <translation>Verfügbare Gase</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>Datenpunkt hinzufügen</translation>
     </message>
@@ -615,10 +712,25 @@ Bitte entferne diese zuerst.</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
-        <source>Pressure  S</source>
+        <source>Pressure S</source>
         <translation>Druck S</translation>
     </message>
     <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <source>pN₂</source>
+        <translation>pN₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>pHe</source>
+        <translation>pHe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Pressure I</source>
         <translation>Druck I</translation>
@@ -631,88 +743,73 @@ Bitte entferne diese zuerst.</translation>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
         <source>SAC</source>
-        <translation>AMV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
-        <source>PN2</source>
-        <translation>pN₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
-        <source>PHE</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
-        <source>PO2</source>
-        <translation>pO₂</translation>
+        <translation>SAC</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>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1298"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
+        <location filename="../qt-ui/models.cpp" line="1307"/>
         <source>suit</source>
         <translation>Anzug</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1310"/>
         <source>cyl</source>
         <translation>Flasche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1344"/>
+        <location filename="../qt-ui/models.cpp" line="1325"/>
         <source>location</source>
         <translation>Tauchplatz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1316"/>
         <source>SAC</source>
-        <translation>AMV</translation>
+        <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1338"/>
+        <location filename="../qt-ui/models.cpp" line="1319"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1341"/>
+        <location filename="../qt-ui/models.cpp" line="1322"/>
         <source>maxCNS</source>
         <translation>max. CNS</translation>
     </message>
@@ -720,115 +817,115 @@ Bitte entferne diese zuerst.</translation>
 <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>Ungültige Serverantwort</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>%1 anstelle des erwarteten XML Tags &apos;DiveDateReader&apos;.</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>XML Tag &apos;DiveDates&apos; nicht gefunden.</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>Ungültige XML Antwort. Zeile %1: %2</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>keine Tauchgänge ausgewählt</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>konnte keine zip Datei für die Übertragung erstellen: %s</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>kann keine temporäre Datei erstellen: %s</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>ein Fehler ist aufgetreten: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="181"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="179"/>
         <source>internal error</source>
         <translation>ein interner Fehler ist aufgetreten</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>Fertig</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>Übertrage Liste der Tauchgänge</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>Liste der Tauchgänge herunterladen...</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>Lade %1 Tauchgänge vom Server...</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>Herunterladen beendet - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
         <source>Corrupted download</source>
         <translation>Heruntergeladene Daten sind beschädigt.</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>Das Archiv konnte nicht geöffnet werden
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Upload failed</source>
         <translation>Übertragung fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="849"/>
         <source>Upload successful</source>
         <translation>Übertragung erfolgreich</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="854"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="852"/>
         <source>Login failed</source>
         <translation>Login fehlgeschlagen</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>Verstehe die Antwort nicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="868"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Error: %1</source>
         <translation>Fehler: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="835"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/>
         <source>Upload finished</source>
         <translation>Übertragung beendet</translation>
     </message>
@@ -836,54 +933,54 @@ Bitte entferne diese zuerst.</translation>
 <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>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="165"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/>
         <source>Error</source>
         <translation>Fehler</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>Wiederholen</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>Finde Uemis Tauchcomputer</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>Datei auswählen, in die das libdivecomputer Log gespeichert wird</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>Log Dateien (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="339"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
         <source>Warning</source>
         <translation>Warnung</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>Wenn der libdivecomputer Dump gespeichert wird, werden keine Tauchgänge zur Liste der Tauchgänge hinzugefügt.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="351"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="352"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Datei auswählen, in die der libdivecomputer Dump gespeichert wird</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="353"/>
         <source>Dump files (*.bin)</source>
         <translation>Dump Dateien (*.bin)</translation>
     </message>
@@ -908,7 +1005,7 @@ Bitte entferne diese zuerst.</translation>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
         <source>Device or Mount Point</source>
-        <translation>Gerät oder Mount-Point</translation>
+        <translation>Gerät oder Einhängepunkt</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
@@ -951,7 +1048,7 @@ Bitte entferne diese zuerst.</translation>
 <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>Ausgewählte Tauchplätze bearbeiten</translation>
     </message>
@@ -960,848 +1057,858 @@ Bitte entferne diese zuerst.</translation>
     <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>Notizen</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>Ort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="148"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Coordinates</source>
         <translation>Koordinaten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="169"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
         <source>Divemaster</source>
         <translation>Tauchgruppenleiter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="155"/>
+        <location filename="../qt-ui/maintab.ui" line="148"/>
         <source>Buddy</source>
         <translation>Partner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="63"/>
-        <source>Start time</source>
-        <translation>Startzeit</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>Lufttemperatur</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>Wassertemperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="127"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Tags</source>
         <translation>Stichworte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="223"/>
         <source>Rating</source>
         <translation>Bewertung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="236"/>
         <source>Visibility</source>
         <translation>Sicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="215"/>
+        <location filename="../qt-ui/maintab.ui" line="127"/>
         <source>Suit</source>
         <translation>Anzug</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>Notizen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="270"/>
+        <location filename="../qt-ui/maintab.ui" line="311"/>
         <source>Equipment</source>
         <translation>Ausrüstung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="350"/>
+        <location filename="../qt-ui/maintab.ui" line="391"/>
         <source>Dive Info</source>
         <translation>Informationen</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>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="414"/>
+        <location filename="../qt-ui/maintab.ui" line="275"/>
+        <source>Time</source>
+        <translation>Zeit</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="455"/>
         <source>Interval</source>
         <translation>Oberflächenpause</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="433"/>
+        <location filename="../qt-ui/maintab.ui" line="474"/>
         <source>Gases Used</source>
         <translation>Verw. Gase</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="452"/>
+        <location filename="../qt-ui/maintab.ui" line="493"/>
         <source>Gas Consumed</source>
         <translation>Verbrauchtes Gas</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>AMV</translation>
+        <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="531"/>
         <source>Max. Depth</source>
         <translation>Max. Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="509"/>
+        <location filename="../qt-ui/maintab.ui" line="550"/>
         <source>Ave. Depth</source>
         <translation>Ø Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="528"/>
+        <location filename="../qt-ui/maintab.ui" line="569"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="547"/>
+        <location filename="../qt-ui/maintab.ui" line="588"/>
         <source>Air Pressure</source>
         <translation>Luftdruck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="566"/>
+        <location filename="../qt-ui/maintab.ui" line="607"/>
         <source>Air Temperature</source>
         <translation>Lufttemperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="585"/>
+        <location filename="../qt-ui/maintab.ui" line="626"/>
         <source>Water Temperature</source>
         <translation>Wassertemperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="604"/>
+        <location filename="../qt-ui/maintab.ui" line="645"/>
         <source>Dive Time</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="623"/>
+        <location filename="../qt-ui/maintab.ui" line="664"/>
         <source>Salinity</source>
         <translation>Salzgehalt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="660"/>
+        <location filename="../qt-ui/maintab.ui" line="701"/>
         <source>Stats</source>
         <translation>Statistiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="746"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="784"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Total Time</source>
         <translation>Gesamtzeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="835"/>
         <source>Dives</source>
         <translation>Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
+        <source>Gas Consumption</source>
+        <translation>Luftverbrauch</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="919"/>
+        <source>Photos</source>
+        <translation>Bilder</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="89"/>
         <source>Cylinders</source>
         <translation>Flaschen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="90"/>
         <source>Add Cylinder</source>
         <translation>Flasche hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="93"/>
         <source>Weights</source>
         <translation>Blei</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>Gewichtsystem hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="438"/>
+        <location filename="../qt-ui/maintab.cpp" line="409"/>
         <source>Trip Location</source>
         <translation>Ziel der Reise</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>Reisenotizen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="42"/>
+        <location filename="../qt-ui/maintab.cpp" line="48"/>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="46"/>
+        <location filename="../qt-ui/maintab.cpp" line="52"/>
         <source>Cancel</source>
         <translation>Abbrechen</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>Lufttemperatur [%1]</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>Wassertemperatur [%1]</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>Diese Reise wird bearbeitet.</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>Mehrere Tauchgänge werden bearbeitet.</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>Dieser Tauchgang wird bearbeitet.</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>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="494"/>
+        <location filename="../qt-ui/maintab.cpp" line="464"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>N</source>
-        <translation>N</translation>
+        <location filename="../qt-ui/maintab.cpp" line="501"/>
+        <source>Deepest Dive</source>
+        <translation>Tiefster Tauchgang</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>S</source>
-        <translation>S</translation>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <source>Shallowest Dive</source>
+        <translation>Seichtester Tauchgang</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>E</source>
-        <translation>O</translation>
+        <location filename="../qt-ui/maintab.cpp" line="794"/>
+        <source>Discard the Changes?</source>
+        <translation>Änderungen rückgängig machen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>W</source>
-        <translation>W</translation>
+        <location filename="../qt-ui/maintab.cpp" line="795"/>
+        <source>You are about to discard your changes.</source>
+        <translation>Sie sind im Begriff die Änderungen zu Verwerfen.</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>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="571"/>
+        <location filename="../qt-ui/mainwindow.ui" line="646"/>
         <source>&amp;File</source>
         <translation>&amp;Datei</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>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Tauchplan Details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="583"/>
+        <source>Print</source>
+        <translation>Drucken</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:'Courier'; 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>&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;</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="606"/>
+        <location filename="../qt-ui/mainwindow.ui" line="679"/>
         <source>&amp;View</source>
         <translation>&amp;Ansicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="628"/>
+        <location filename="../qt-ui/mainwindow.ui" line="701"/>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="636"/>
+        <location filename="../qt-ui/mainwindow.ui" line="709"/>
         <source>&amp;Import</source>
         <translation>&amp;Importieren</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>&amp;Neues Logbuch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="655"/>
+        <location filename="../qt-ui/mainwindow.ui" line="728"/>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="658"/>
+        <location filename="../qt-ui/mainwindow.ui" line="731"/>
         <source>Ctrl+N</source>
-        <translation>Strg+N</translation>
+        <translation>Ctrl+N</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>Logbuch &amp;öffnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="666"/>
+        <location filename="../qt-ui/mainwindow.ui" line="739"/>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <location filename="../qt-ui/mainwindow.ui" line="742"/>
         <source>Ctrl+O</source>
-        <translation>Strg+O</translation>
+        <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="674"/>
+        <location filename="../qt-ui/mainwindow.ui" line="747"/>
         <source>&amp;Save</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="677"/>
+        <location filename="../qt-ui/mainwindow.ui" line="750"/>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="680"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Ctrl+S</source>
-        <translation>Strg+S</translation>
+        <translation>Ctrl+S</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>Speichern als</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>Save as</source>
         <translation>Speichern unter</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>Strg+Shift+S</translation>
+        <translation>Ctrl+Shift+S</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <source>&amp;Close</source>
+        <translation>Schliessen</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="772"/>
         <source>Close</source>
-        <translation>Schließen</translation>
+        <translation>Schliessen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="702"/>
+        <location filename="../qt-ui/mainwindow.ui" line="775"/>
         <source>Ctrl+W</source>
-        <translation>Strg+W</translation>
+        <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="902"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <source>P&amp;references</source>
+        <translation>Einstellungen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="831"/>
+        <source>&amp;Add Dive</source>
+        <translation>Tauchgang hinzufügen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <source>Auto &amp;Group</source>
+        <translation>Automatisch gruppieren</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="863"/>
+        <source>&amp;Dive List</source>
+        <translation>Tauchgangliste</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="871"/>
+        <source>&amp;Profile</source>
+        <translation>Profil</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="879"/>
+        <source>&amp;Info</source>
+        <translation>Informationen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="887"/>
+        <source>&amp;All</source>
+        <translation>Alle</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="895"/>
+        <source>P&amp;rev DC</source>
+        <translation>Vorh. TC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="903"/>
+        <source>&amp;Next DC</source>
+        <translation>Nächster TC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="911"/>
+        <source>&amp;Select Events</source>
+        <translation>Ereignisse auswählen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <source>&amp;About Subsurface</source>
+        <translation>Info zu Subsurface</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="937"/>
+        <source>&amp;Globe</source>
+        <translation>Globus</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="953"/>
+        <source>&amp;Import Log Files</source>
+        <translation>Importiere Log-Dateien</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="959"/>
         <source>Ctrl+I</source>
-        <translation>Strg+I</translation>
+        <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="707"/>
-        <source>Export &amp;UDDF</source>
-        <translation>Exportiere &amp;UDDF</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="1008"/>
+        <source>&amp;Export</source>
+        <translation>Exportiere</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1011"/>
+        <source>Export Dive Logs</source>
+        <translation>Exportiere Tauchlogs</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1014"/>
+        <source>Ctrl+E</source>
+        <translation>Strg+E</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Enable the pN2 Graph</source>
         <translation>Blende pN₂ Kurve ein</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <location filename="../qt-ui/mainwindow.ui" line="128"/>
         <source>Enable the pHe graph</source>
         <translation>Blende pHe Kurve ein</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <location filename="../qt-ui/mainwindow.ui" line="290"/>
         <source>Show/hide heart rate</source>
         <translation>Pulsrate anzeigen/verbergen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <location filename="../qt-ui/mainwindow.ui" line="342"/>
         <source>Enable EAD, END, and EADD</source>
         <translation>EAD, END, EADD anzeigen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="238"/>
         <source>Show NDL / TTS</source>
         <translation>Zeige NTL / TTS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="456"/>
+        <location filename="../qt-ui/mainwindow.ui" line="394"/>
         <source>Rescale depth axis</source>
         <translation>Tiefenachse neu skalieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="710"/>
-        <source>Ctrl+U</source>
-        <translation>Strg+U</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="715"/>
-        <source>Export HTML World Map</source>
-        <translation>HTML Weltkarte exportieren</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="718"/>
-        <source>Ctrl+H</source>
-        <translation>Ctrl+H</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="723"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>&amp;Print</source>
         <translation>&amp;Drucken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="734"/>
+        <location filename="../qt-ui/mainwindow.ui" line="791"/>
         <source>Ctrl+,</source>
-        <translation>Strg+,</translation>
+        <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="742"/>
+        <location filename="../qt-ui/mainwindow.ui" line="799"/>
         <source>&amp;Quit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="753"/>
+        <location filename="../qt-ui/mainwindow.ui" line="810"/>
         <source>Import from &amp;dive computer</source>
         <translation>Von &amp;Tauchcomputer importieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="818"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation>&amp;GPS Daten vom Subsurface Service importieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="764"/>
+        <location filename="../qt-ui/mainwindow.ui" line="821"/>
         <source>Ctrl+G</source>
-        <translation>Strg+G</translation>
+        <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="826"/>
         <source>&amp;Edit Device Names</source>
         <translation>Gerätenamen &amp;bearbeiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="834"/>
         <source>Ctrl++</source>
-        <translation>Strg++</translation>
+        <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="782"/>
+        <location filename="../qt-ui/mainwindow.ui" line="839"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Neu nummerieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="785"/>
+        <location filename="../qt-ui/mainwindow.ui" line="842"/>
         <source>Ctrl+R</source>
-        <translation>Strg+R</translation>
+        <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="798"/>
+        <location filename="../qt-ui/mainwindow.ui" line="855"/>
         <source>&amp;Yearly Statistics</source>
         <translation>&amp;Jahresstatistiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="801"/>
+        <location filename="../qt-ui/mainwindow.ui" line="858"/>
         <source>Ctrl+Y</source>
-        <translation>Strg+Y</translation>
+        <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="806"/>
-        <source>Dive List</source>
-        <translation>Tauchgangliste</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="814"/>
-        <source>Profile</source>
-        <translation>Profil</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="822"/>
-        <source>Info</source>
-        <translation>Informationen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="830"/>
-        <source>All</source>
-        <translation>Alle</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="872"/>
+        <location filename="../qt-ui/mainwindow.ui" line="929"/>
         <source>User &amp;Manual</source>
         <translation>&amp;Bedienungsanleitung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="880"/>
-        <source>Globe</source>
-        <translation>Globus</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="888"/>
+        <location filename="../qt-ui/mainwindow.ui" line="945"/>
         <source>P&amp;lan Dive</source>
         <translation>Tauchgang p&amp;lanen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="891"/>
+        <location filename="../qt-ui/mainwindow.ui" line="948"/>
         <source>Ctrl+L</source>
-        <translation>Strg+L</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="907"/>
-        <source>Import from Divelogs.de</source>
-        <translation>von Divelogs.de importieren</translation>
+        <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1003"/>
         <source>&amp;Check for Updates</source>
         <translation>Neue Version suchen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="951"/>
-        <source>Export CSV</source>
-        <translation>CSV Exportieren</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="726"/>
+        <location filename="../qt-ui/mainwindow.ui" line="783"/>
         <source>Ctrl+P</source>
-        <translation>Strg+P</translation>
+        <translation>Ctrl+P</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>Blende pO2 Kurve ein</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>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="316"/>
         <source>Enable MOD</source>
         <translation>MOD einschalten</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>Vom TC ausgelesene tiefste Deko-Stopps anzeigen</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>Berechnete tiefste Deko-Stopps anzeigen</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>Berechnete tiefste Deko-Stopps in 3m Schritten anzeigen</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>Berechne alle Gewebe</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>Zeige AMV Rate</translation>
+        <translation>Zeige SAC Rate</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>Lineal Ein-/Ausblenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="731"/>
-        <source>Preferences</source>
-        <translation>Einstellungen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="745"/>
+        <location filename="../qt-ui/mainwindow.ui" line="802"/>
         <source>Ctrl+Q</source>
-        <translation>Strg+Q</translation>
+        <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="756"/>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
         <source>Ctrl+D</source>
-        <translation>Strg+D</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="774"/>
-        <source>Add Dive</source>
-        <translation>Tauchgang hinzufügen</translation>
+        <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="793"/>
-        <source>Auto Group</source>
-        <translation>Automatisch gruppieren</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="809"/>
+        <location filename="../qt-ui/mainwindow.ui" line="866"/>
         <source>Ctrl+2</source>
-        <translation>Strg+2</translation>
+        <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="817"/>
+        <location filename="../qt-ui/mainwindow.ui" line="874"/>
         <source>Ctrl+3</source>
-        <translation>Strg+3</translation>
+        <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <location filename="../qt-ui/mainwindow.ui" line="882"/>
         <source>Ctrl+4</source>
-        <translation>Strg+4</translation>
+        <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="833"/>
+        <location filename="../qt-ui/mainwindow.ui" line="890"/>
         <source>Ctrl+1</source>
-        <translation>Strg+1</translation>
+        <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="838"/>
-        <source>Prev DC</source>
-        <translation>Vorh. TC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="841"/>
+        <location filename="../qt-ui/mainwindow.ui" line="898"/>
         <source>Left</source>
         <translation>Links</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="846"/>
-        <source>Next DC</source>
-        <translation>Nächster TC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="849"/>
+        <location filename="../qt-ui/mainwindow.ui" line="906"/>
         <source>Right</source>
         <translation>Rechts</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="854"/>
-        <source>Select Events</source>
-        <translation>Ereignisse auswählen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <location filename="../qt-ui/mainwindow.ui" line="916"/>
         <source>Input Plan</source>
         <translation>Plan eingeben</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="864"/>
-        <source>About Subsurface</source>
-        <translation>Über Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="875"/>
+        <location filename="../qt-ui/mainwindow.ui" line="932"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="883"/>
+        <location filename="../qt-ui/mainwindow.ui" line="940"/>
         <source>Ctrl+5</source>
-        <translation>Strg+5</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="896"/>
-        <source>Import Log Files</source>
-        <translation>Importiere Log-Dateien</translation>
+        <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="899"/>
+        <location filename="../qt-ui/mainwindow.ui" line="956"/>
         <source>Import divelog files from other applications</source>
         <translation>Importiere Tauchlogdateien aus anderen Anwendungen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="915"/>
+        <location filename="../qt-ui/mainwindow.ui" line="964"/>
+        <source>Import &amp;from Divelogs.de</source>
+        <translation>von Divelogs.de importieren</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="972"/>
         <source>&amp;Full Screen</source>
         <translation>&amp;Vollbild</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>Vollbild Umschalten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <location filename="../qt-ui/mainwindow.ui" line="978"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="174"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
         <source>Open File</source>
         <translation>Datei öffnen</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>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor das Logbuch geschlossen werden kann.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="330"/>
-        <source>Please save or cancel the current dive edit before trying to plan a dive.</source>
-        <translation>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor ein neuer Tauchplan bearbeitet werden kann.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="396"/>
+        <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>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor ein neuer Tauchgang hinzugefügt werden kann.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="645"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="419"/>
+        <source>Print runtime table</source>
+        <translation>Zeige Laufzeit Tabelle</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="710"/>
         <source>Do you want to save the changes you made in the file %1?</source>
         <translation>Möchtest Du die Änderungen in der Datei %1 speichern?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="647"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="712"/>
         <source>Do you want to save the changes you made in the datafile?</source>
         <translation>Möchtest Du die Änderungen in der Daten-Datei speichern?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="652"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="717"/>
         <source>Save Changes?</source>
         <translation>Änderungen speichern?</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>Änderungen gehen verloren wenn Du sie nicht speicherst.</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>Datei speichern unter</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>Warnung</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>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor ein neues Logbuch geöffnet werden kann.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="280"/>
-        <source>Export UDDF File as</source>
-        <translation>UDDF Datei exportieren als</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="281"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>UDDF Dateien (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="289"/>
-        <source>Export CSV File as</source>
-        <translation>CSV Datei exportieren als</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="290"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>CSV Dateien (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="299"/>
-        <source>Export World Map</source>
-        <translation>Weltkarte exportieren</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="300"/>
-        <source>HTML files (*.html)</source>
-        <translation>HTML Dateien (*.html)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="449"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="514"/>
         <source>Yearly Statistics</source>
         <translation>Jahresstatistiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="961"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1076"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1199"/>
         <source>Open Dive Log File</source>
         <translation>Öffne Tauchlog Datei</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <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>Tauchlog Dateien (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML Dateien (*.xml);;UDDF/UDCF Dateien(*.uddf *.udcf);;JDiveLog Dateien(*.jlb);;Suunto Dateien(*.sde *.db);;CSV Files(*.csv);;Alle Dateien(*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1225"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Bitte zuerst die aktuelle Bearbeitung abschliessen um eine Neue zu beginnen.</translation>
     </message>
 </context>
 <context>
+    <name>PlannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Last stop at 20ft</source>
+        <translation>Letzter Stopp auf 20 Fuß</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="416"/>
+        <source>Last stop at 6m</source>
+        <translation>Letzter Stopp auf 6m</translation>
+    </message>
+</context>
+<context>
     <name>PreferencesDialog</name>
     <message>
         <location filename="../qt-ui/preferences.ui" line="85"/>
@@ -1824,247 +1931,297 @@ Bitte entferne diese zuerst.</translation>
         <translation>Sprache</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="141"/>
+        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <source>Network</source>
+        <translation>Netzwerk</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="151"/>
         <source>Lists and Tables</source>
         <translation>Listen und Tabellen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font</source>
         <translation>Schriftart</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="167"/>
         <source>Font size</source>
-        <translation>Schriftgröße</translation>
+        <translation>Schriftgrösse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="170"/>
+        <location filename="../qt-ui/preferences.ui" line="180"/>
         <source>Dives</source>
         <translation>Tauchgänge</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>Standard Tauch Datei</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="188"/>
+        <location filename="../qt-ui/preferences.ui" line="198"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="197"/>
+        <location filename="../qt-ui/preferences.ui" line="207"/>
         <source>Display Invalid</source>
         <translation>Zeige auch ungültige?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="214"/>
+        <location filename="../qt-ui/preferences.ui" line="224"/>
         <source>Default Cylinder</source>
         <translation>Standardflasche</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>Wähle Deine Standardflasche(n)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <location filename="../qt-ui/preferences.ui" line="247"/>
         <source>Animations</source>
         <translation>Animationen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <location filename="../qt-ui/preferences.ui" line="253"/>
         <source>Speed</source>
         <translation>Geschwindigkeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="270"/>
+        <location filename="../qt-ui/preferences.ui" line="280"/>
         <source>Subsurface Webservice</source>
         <translation>Subsurface Webservice</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>Standard Benutzer-Kennung</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>Benutzer-Kennung lokal speichern?</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>Alle Einstellungen Zurücksetzen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="312"/>
+        <source>Reset all settings to their default value</source>
+        <translation>Alle Einstellungen auf den Default Wert setzen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="348"/>
         <source>Metric</source>
         <translation>Metrisch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="333"/>
+        <location filename="../qt-ui/preferences.ui" line="358"/>
         <source>Imperial</source>
         <translation>Zöllig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="343"/>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
         <source>Personalize</source>
         <translation>Personalisieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="392"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="374"/>
+        <location filename="../qt-ui/preferences.ui" line="399"/>
         <source>meter</source>
         <translation>Meter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="409"/>
         <source>feet</source>
-        <translation>Fuß</translation>
+        <translation>Fuss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="401"/>
+        <location filename="../qt-ui/preferences.ui" line="426"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="411"/>
+        <location filename="../qt-ui/preferences.ui" line="436"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="428"/>
+        <location filename="../qt-ui/preferences.ui" line="453"/>
         <source>liter</source>
         <translation>Liter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="438"/>
+        <location filename="../qt-ui/preferences.ui" line="463"/>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="455"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>celsius</source>
         <translation>Celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="465"/>
+        <location filename="../qt-ui/preferences.ui" line="490"/>
         <source>fahrenheit</source>
         <translation>Fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="482"/>
+        <location filename="../qt-ui/preferences.ui" line="507"/>
         <source>kg</source>
         <translation>kg</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>Schwellenwert bei pO₂ Anzeige</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>Schwellenwert bei pN₂ Anzeige</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>Schwellenwert bei pHe Anzeige</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="636"/>
-        <source>max ppO₂ when showing MOD</source>
-        <translation>max ppO₂ bei MOD Anzeige</translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="811"/>
+        <source>Proxy</source>
+        <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="657"/>
+        <location filename="../qt-ui/preferences.ui" line="817"/>
+        <source>Proxy type</source>
+        <translation>Proxy Typ</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="830"/>
+        <source>Host</source>
+        <translation>Host</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="856"/>
+        <source>Port</source>
+        <translation>Port</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="882"/>
+        <source>Requires authentication</source>
+        <translation>Anmeldung erforderlich</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
+        <source>Username</source>
+        <translation>Benutzername</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="925"/>
+        <source>Password</source>
+        <translation>Passwort</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="682"/>
         <source>draw dive computer reported ceiling red</source>
         <translation>Zeichne Auftauchgrenze des Tauchcomputers in rot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="747"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>System Default</source>
-        <translation>Standardeinstellungen</translation>
+        <translation>Systemeinstellungen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="767"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="419"/>
         <source>Pressure</source>
         <translation>Druck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="421"/>
+        <location filename="../qt-ui/preferences.ui" line="446"/>
         <source>Volume</source>
         <translation>Volumen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="448"/>
+        <location filename="../qt-ui/preferences.ui" line="473"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="475"/>
+        <location filename="../qt-ui/preferences.ui" line="500"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="517"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="507"/>
+        <location filename="../qt-ui/preferences.ui" line="532"/>
         <source>Time units</source>
         <translation>Zeiteinheiten</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>Zeiteinheit für Geschwindigkeit bei Aufstieg/Abstieg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="520"/>
+        <location filename="../qt-ui/preferences.ui" line="545"/>
         <source>Minutes</source>
         <translation>Minuten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="530"/>
+        <location filename="../qt-ui/preferences.ui" line="555"/>
         <source>Seconds</source>
         <translation>Sekunden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="562"/>
+        <location filename="../qt-ui/preferences.ui" line="587"/>
         <source>Show</source>
         <translation>Anzeigen</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>max pO₂ bei MOD Anzeige</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="693"/>
         <source>Show non-used cylinders in Equipment Tab</source>
         <translation>Nicht benutzte Flaschen unter Ausrüstung anzeigen</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>Durchschnittstiefe anzeigen</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>GF low bei maximaler Tiefe anwenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="691"/>
+        <location filename="../qt-ui/preferences.ui" line="716"/>
         <source>Misc</source>
         <translation>Sonstiges</translation>
     </message>
@@ -2074,35 +2231,65 @@ Bitte entferne diese zuerst.</translation>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="697"/>
+        <location filename="../qt-ui/preferences.ui" line="722"/>
         <source>GFLow</source>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="739"/>
         <source>GFHigh</source>
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="23"/>
+        <source>No proxy</source>
+        <translation>Kein Proxy</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="24"/>
+        <source>System proxy</source>
+        <translation>System-Proxy</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="25"/>
+        <source>HTTP proxy</source>
+        <translation>HTTP Proxy</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="26"/>
+        <source>SOCKS proxy</source>
+        <translation>SOCKS Proxy</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="245"/>
         <source>Restart required</source>
         <translation>Bitte Programm neu starten</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>Um die neue Sprache laden zu können, muss Subsurface neu gestartet werden.</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>Standard Logfile öffnen</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>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="394"/>
+        <source>Warning</source>
+        <translation>Warnung</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>Wenn Sie bestätigen werden alle Einstellungen zurückgesetzt. Dies hat sofortige Wirkung.</translation>
+    </message>
 </context>
 <context>
     <name>PrintDialog</name>
@@ -2147,7 +2334,7 @@ Bitte entferne diese zuerst.</translation>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Master</source>
-        <translation>Leiter</translation>
+        <translation>Guide</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="30"/>
@@ -2243,72 +2430,72 @@ Bitte entferne diese zuerst.</translation>
 <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>unbekannt</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>Tauchgang Nr %1 - %2</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>max Tiefe: %1 %2</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>Dauer: %1 Minuten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1918"/>
+        <location filename="../qt-ui/models.cpp" line="1898"/>
         <source>Gas Used:</source>
         <translation>Verw. Gas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1920"/>
+        <location filename="../qt-ui/models.cpp" line="1900"/>
         <source>SAC:</source>
-        <translation>AMV:</translation>
+        <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1922"/>
+        <location filename="../qt-ui/models.cpp" line="1902"/>
         <source>Max. CNS:</source>
         <translation>Max. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1924"/>
+        <location filename="../qt-ui/models.cpp" line="1904"/>
         <source>Weights:</source>
         <translation>Blei:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1929"/>
+        <location filename="../qt-ui/models.cpp" line="1909"/>
         <source>Notes:</source>
         <translation>Notizen:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1936"/>
+        <location filename="../qt-ui/models.cpp" line="1916"/>
         <source>Divemaster:</source>
-        <translation>Tauchgruppenleiter:</translation>
+        <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1938"/>
+        <location filename="../qt-ui/models.cpp" line="1918"/>
         <source>Buddy:</source>
-        <translation>Partner:</translation>
+        <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1940"/>
+        <location filename="../qt-ui/models.cpp" line="1920"/>
         <source>Suit:</source>
         <translation>Anzug:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1942"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>Viz:</source>
         <translation>Sicht:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1944"/>
+        <location filename="../qt-ui/models.cpp" line="1924"/>
         <source>Rating:</source>
         <translation>Bewertung:</translation>
     </message>
@@ -2316,62 +2503,77 @@ Bitte entferne diese zuerst.</translation>
 <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> (#%1 von %2)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/>
+        <source>Make first divecomputer</source>
+        <translation>Primärer Tauchcomputer</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="906"/>
+        <source>Delete this divecomputer</source>
+        <translation>Lösche diesen Tauchcomputer</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="913"/>
         <source>Add Gas Change</source>
         <translation>Gaswechsel setzen</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>Markierung setzen</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>Entferne Ereigniss</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>Ähnliche Ereignisse ausblenden</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>Name bearbeiten</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>Alle Ereignisse einblenden</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>Ereignisse ausblenden</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>Alle %1 Ereignisse ausblenden?</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>Ausgewähltes Ereignis entfernen?</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>%1 @ %2:%3</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>Name der Markierung bearbeiten</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>Benutzerdefinierter Name:</translation>
     </message>
@@ -2379,37 +2581,37 @@ Bitte entferne diese zuerst.</translation>
 <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>Luft</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>Diesen Punkt entfernen</translation>
     </message>
     <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
-        <translation>Schließen</translation>
+        <translation>Schliessen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="34"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation>Ø</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="37"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation>Min.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="40"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation>Max.</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>Karte verschieben und mit Doppelklick Tauchplatz markieren</translation>
     </message>
@@ -2423,9 +2625,23 @@ Bitte entferne diese zuerst.</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="128"/>
         <source>New starting number</source>
         <translation>Neue erste Nummer</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="126"/>
+        <source>New number</source>
+        <translation>Neue Nummer</translation>
+    </message>
+</context>
+<context>
+    <name>SearchBar</name>
+    <message>
+        <location filename="../qt-ui/searchbar.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formular</translation>
+    </message>
 </context>
 <context>
     <name>ShiftImageTimesDialog</name>
@@ -2440,42 +2656,47 @@ Bitte entferne diese zuerst.</translation>
         <translation>Ausgewählte Zeiten von Bild(ern) verschieben um...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="102"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="95"/>
+        <source>h:mm</source>
+        <translation>h:mm</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="105"/>
         <source>earlier</source>
         <translation>früher</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="109"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="112"/>
         <source>later</source>
         <translation>später</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>Um den Zeitversatz zwischen der Uhrzeit des Tauchcomputers und der Kamera zu berechnen machen sie einfach ein Bild ihres Tauchcomputers mit der Kamera. Laden sie dieses Bild in den Computer und drücken diesen Knopf.</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>Versatz der Kamerazeit festlegen</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>Wähle Bild des Tauchcomputers das die Zeit zeigt</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>Welche/s Datum/Zeit werden im Bild angezeigt?</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>Öffne Bilddateien</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>Bilddateien (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2544,7 +2765,7 @@ Bitte entferne diese zuerst.</translation>
     <message>
         <location filename="../qt-ui/about.ui" line="94"/>
         <source>&amp;Close</source>
-        <translation>Schließen</translation>
+        <translation>Schliessen</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="13"/>
@@ -2555,42 +2776,42 @@ Bitte entferne diese zuerst.</translation>
 <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>Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/>
         <source>Connecting...</source>
         <translation>Verbinde...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="421"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="419"/>
         <source>Download finished</source>
         <translation>Herunterladen beendet</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>Fehler beim Herunterladen: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/>
         <source>Connection Error: </source>
         <translation>Verbindungsfehler: </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>Ungültige Benutzerkennung</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>Verstehe die Antwort nicht!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/>
         <source>Download Success!</source>
         <translation>Erfolgreich geladen!</translation>
     </message>
@@ -2606,17 +2827,17 @@ Bitte entferne diese zuerst.</translation>
 <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>Beschreibung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2624,7 +2845,7 @@ Bitte entferne diese zuerst.</translation>
 <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>Information</translation>
     </message>
@@ -2632,42 +2853,42 @@ Bitte entferne diese zuerst.</translation>
 <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>Neue Version suchen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="37"/>
-        <source>&lt;h3&gt;Subsurface was unable to check for updates.&lt;/h3&gt;</source>
-        <translation>&lt;h3&gt;Subsurface konnte nicht nach neuen Versionen suchen.&lt;/h3&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="36"/>
+        <source>Subsurface was unable to check for updates.</source>
+        <translation>Subsurface konnte nicht nach neuen Versionen suchen.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
-        <source>&lt;br/&gt;&lt;b&gt;The following error occurred:&lt;/b&gt;&lt;br/&gt;</source>
-        <translation>&lt;br/&gt;&lt;b&gt;Folgende Fehlermeldung erhalten:&lt;/b&gt;&lt;br/&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="41"/>
+        <source>The following error occurred:</source>
+        <translation>Folgende Fehlermeldung erhalten:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="43"/>
-        <source>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Please check your internet connection.&lt;/b&gt;</source>
-        <translation>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Bitte Internet Verbindung Überprüfen.&lt;/b&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
+        <source>Please check your internet connection.</source>
+        <translation>Bitte Internet Verbindung Überprüfen.</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>Dies ist die aktuelle Subsurface Version</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>Eine neuere Subsurface Version kann hier heruntergeladen werden&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="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>&lt;b&gt;Eine neue Subsurface Version wurde freigegeben.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</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>Während der Suche nach einer neuen Version ist ein Fehler aufgetreten.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -2675,25 +2896,163 @@ Bitte entferne diese zuerst.</translation>
 <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>Benutzerhandbuch</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>Kann das Subsurface Handbuch nicht finden</translation>
     </message>
 </context>
 <context>
+    <name>UserSurvey</name>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>Dialog</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="47"/>
+        <source>Subsurface User Survey</source>
+        <translation>Subsurface Benutzerumfrage</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>Wir würden gerne mehr über unsere Benutzer erfahren, Ihre Präferenzen und die Art der Benutzung. Bitte nehmen Sie sich eine Minute Zeit um diese Umfrage auszufüllen und sie dem Subsurface Team zu schicken. Bitte wählen sie alle Auswahlmöglichkeiten die auf Sie zutreffen.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="79"/>
+        <source>Recreational DIver</source>
+        <translation>Freizeittaucher</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="92"/>
+        <source>Tech Diver</source>
+        <translation>Tech Taucher</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="105"/>
+        <source>Interested in dive planning</source>
+        <translation>Interessiert an Tauchgangsplanung</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="118"/>
+        <source>I am downloading dives from supported dive computer</source>
+        <translation>Ich lade Tauchgänge vom unterstützten Tauchcomputer</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="131"/>
+        <source>I am importing dives from other software / sources</source>
+        <translation>Ich importiere Tauchgänge aus anderer Software / Quellen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="144"/>
+        <source>I am manually entering dives</source>
+        <translation>Ich gebe Tauchgänge manuell ein</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="167"/>
+        <source>I use the Android companion app to track dive locations</source>
+        <translation>Ich benutze die Android App um Tauchplätze zu loggen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="190"/>
+        <source>Please type suggestions (in English) in the following box</source>
+        <translation>Bitte geben Sie uns Anregungen (wenn möglich auf Englisch) hier</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="203"/>
+        <source>The following information about your system will also be submitted</source>
+        <translation>Die folgenden Systeminformationen werden ebenfalls übertragen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="27"/>
+        <source>
+Operating System: %1</source>
+        <translation>Betriebssystem %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="30"/>
+        <source>
+CPU Architecture: %1</source>
+        <translation>Prozessor Architektur: %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="35"/>
+        <source>
+OS CPU Architecture %1</source>
+        <translation>Prozessor Architektur (laut Betriebsystem)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="39"/>
+        <source>
+Language: %1</source>
+        <translation>Sprache: %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="73"/>
+        <source>Should we ask you later?</source>
+        <translation>Sollen wir später noch einmal fragen?</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="74"/>
+        <source>Don&apos;t ask me again</source>
+        <translation>Fragt mich nicht mehr</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="75"/>
+        <source>Ask Later</source>
+        <translation>Fragt später</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="76"/>
+        <source>Ask again?</source>
+        <translation>Fragt noch einmal?</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <source>Submit User Survey.</source>
+        <translation>Unfrageergebnis übertragen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <source>Subsurface was unable to submit the user survey.</source>
+        <translation>Subsurface konnte die Benutzerumfrage nicht übertragen.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="101"/>
+        <source>The following error occurred:</source>
+        <translation>Folgende Fehlermeldung erhalten:</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="102"/>
+        <source>Please check your internet connection.</source>
+        <translation>Bitte Internet Verbindung Überprüfen.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="111"/>
+        <source>Survey successfully submitted.</source>
+        <translation>Benutzerumfrage erfolgreich übertragen</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>Während der Suche nach einer neuen Version ist ein Fehler aufgetreten.&lt;br/&gt;&lt;br/&gt;%1</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>Beschreibung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="723"/>
+        <location filename="../qt-ui/models.cpp" line="721"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2741,12 +3100,12 @@ Bitte entferne diese zuerst.</translation>
         <translation>Hochladen</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>Die Aktion hat zu lange gedauert</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="279"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="277"/>
         <source>Transfering data...</source>
         <translation>Übertrage Daten...</translation>
     </message>
@@ -2754,37 +3113,37 @@ Bitte entferne diese zuerst.</translation>
 <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>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="368"/>
+        <location filename="../qt-ui/models.cpp" line="373"/>
         <source>Weight</source>
         <translation>Gewicht</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>Hier klicken entfernt dieses Gewichtssystem.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="453"/>
+        <location filename="../qt-ui/models.cpp" line="458"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="454"/>
+        <location filename="../qt-ui/models.cpp" line="459"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="478"/>
+        <location filename="../qt-ui/models.cpp" line="483"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="484"/>
         <source>m</source>
         <translation>m</translation>
     </message>
@@ -2792,79 +3151,79 @@ Bitte entferne diese zuerst.</translation>
 <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>Jahr 
  &gt; Monat / Reise</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1643"/>
         <source>Duration 
  Total</source>
         <translation>Dauer
 Gesamt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>
 Average</source>
         <translation>
 Ø</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>
 Shortest</source>
         <translation>
 Kürzester</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>
 Longest</source>
         <translation>
 Längster</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>Tiefe (%1)
  Durchschnitt</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>
 Minimum</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>
 Maximum</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>AMV (%1)
+        <translation>SAC (%1)
  Durchschnitt</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>Temp. (%1)
@@ -2874,99 +3233,92 @@ Mittel</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="58"/>
+        <location filename="../dive.c" line="87"/>
         <source>pascal</source>
         <translation>Pa</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>bar</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>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="104"/>
-        <location filename="../qt-gui.cpp" line="292"/>
-        <source>l</source>
-        <translation>l</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>cuft</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>m</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>ft</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>US Pfund</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>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1120"/>
+        <location filename="../dive.c" line="1237"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) oder (%s)</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>Luft</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="170"/>
+        <location filename="../equipment.c" line="210"/>
         <source>integrated</source>
         <translation>integriert</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="171"/>
+        <location filename="../equipment.c" line="211"/>
         <source>belt</source>
         <translation>Gürtel</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="172"/>
+        <location filename="../equipment.c" line="212"/>
         <source>ankle</source>
-        <translation>Fußblei</translation>
+        <translation>Fussblei</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="173"/>
+        <location filename="../equipment.c" line="213"/>
         <source>backplate weight</source>
         <translation>Backplate-Gewicht</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="174"/>
+        <location filename="../equipment.c" line="214"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -2983,253 +3335,253 @@ Mittel</translation>
         <translation>maximale Anzahl der unterstützten Spalten beim CSV-Import sind %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>none</source>
         <translation>keine</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>deco stop</source>
         <translation>Deko-Stopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ascent</source>
         <translation>Aufstieg</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ceiling</source>
         <translation>tiefster Deko-Stopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>workload</source>
         <translation>Arbeit</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>transmitter</source>
         <translation>Sender</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>violation</source>
         <translation>Verletzung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>bookmark</source>
         <translation>Markierung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>surface</source>
         <translation>Oberfläche</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>safety stop</source>
         <translation>Sicherheitsstopp</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>Gaswechsel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (voluntary)</source>
         <translation>Sicherheitsstopp (freiwillig)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (mandatory)</source>
-        <translation>Sicherheitsstopp (verpflichtend)</translation>
+        <translation>Sicherheitsstopp (obligatorisch)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>deepstop</source>
         <translation>Tiefen-Stopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>ceiling (safety stop)</source>
         <translation>Sicherheits-Stopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>divetime</source>
         <translation>Tauchgangsdauer</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>unterhalb Dekotiefe</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>maxdepth</source>
         <translation>Max. Tiefe</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>PO2</source>
         <translation>PO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>airtime</source>
         <translation>verbleibende Atemzeit</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>heading</source>
         <translation>Richtung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>tissue level warning</source>
         <translation>Gewebewarnung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>non stop time</source>
         <translation>Nullzeit</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="163"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>invalid event number</source>
         <translation>ungültige Ereignisnummer</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>Nicht in der Lage, einen Parser für %s %s zu erstellen</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="411"/>
+        <location filename="../libdivecomputer.c" line="414"/>
         <source>Error registering the data</source>
         <translation>Fehler beim Registrieren der Daten</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="419"/>
+        <location filename="../libdivecomputer.c" line="422"/>
         <source>Error parsing the datetime</source>
         <translation>Fehler beim Lesen des Datums</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="438"/>
         <source>Dive %d: %s %d %04d</source>
         <translation>Tauchgang Nr. %d: %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="440"/>
+        <location filename="../libdivecomputer.c" line="443"/>
         <source>Error parsing the divetime</source>
         <translation>Fehler beim Lesen der Dauer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="449"/>
+        <location filename="../libdivecomputer.c" line="452"/>
         <source>Error parsing the maxdepth</source>
         <translation>Fehler beim Lesen der maximalen Tiefe</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="458"/>
+        <location filename="../libdivecomputer.c" line="461"/>
         <source>Error parsing the gas mix count</source>
         <translation>Fehler beim Lesen der Gasgemischszahl</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="470"/>
+        <location filename="../libdivecomputer.c" line="473"/>
         <source>Error obtaining water salinity</source>
         <translation>Fehler beim Lesen des Salzgehalts</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error obtaining surface pressure</source>
         <translation>Kein Oberflächendruck erhalten</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the gas mix</source>
         <translation>Fehler beim Lesen der Gasgemischs</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="493"/>
+        <location filename="../libdivecomputer.c" line="496"/>
         <source>Error parsing the samples</source>
         <translation>Fehler beim Lesen der Samples</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="623"/>
+        <location filename="../libdivecomputer.c" line="626"/>
         <source>Event: waiting for user action</source>
         <translation>Ereignis: warte auf Benutzeraktion</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>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="691"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the event handler.</source>
         <translation>Fehler beim Registrieren der Ereignisbehandlung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="696"/>
+        <location filename="../libdivecomputer.c" line="699"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Fehler bei der Registrierung der Abbruchbehandlung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="717"/>
+        <location filename="../libdivecomputer.c" line="720"/>
         <source>Dive data import error</source>
         <translation>Fehler beim Importieren der Tauchgangsdaten</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="756"/>
+        <location filename="../libdivecomputer.c" line="759"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Fehler beim Erzeugen des libdivecomputer Contexts</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="763"/>
+        <location filename="../libdivecomputer.c" line="766"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Fehler beim Öffnen von %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="462"/>
+        <location filename="../parse-xml.c" line="466"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Unverständliche Prozentangabe %s
 </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>Fehler beim Lesen von &apos;%s&apos;</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>Datenbank Anfrage &apos;get_events&apos; fehlgeschlagen.
 </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>Datenbank Anfrage &apos;get_tags&apos; fehlgeschlagen.
@@ -3243,111 +3595,163 @@ Mittel</translation>
 </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 '%s'.
 </source>
         <translation>Datenbank Anfrage fehlgeschlagen &apos;%s&apos;.
 </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>Datenbank Anfrage &apos;get_cylinders&apos; fehlgeschlagen.
 </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>Datenbank Anfrage &apos;get_changes&apos; fehlgeschlagen.
 </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>Datenbank Anfrage &apos;get_profile_sample&apos; fehlgeschlagen.
 </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>Kann Stylesheet %s nicht öffnen</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>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="146"/>
-        <location filename="../planner.c" line="617"/>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation>Kann Gasgemisch %d/%d nicht finden</translation>
+        <location filename="../planner.c" line="159"/>
+        <location filename="../planner.c" line="752"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation>Kann Gas %s nicht finden</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="308"/>
+        <location filename="../planner.c" line="345"/>
         <source>Too many gas mixes</source>
         <translation>Zu viele Gasgemische</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="489"/>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation>%s
-Subsurface Tauchplan
-basierend auf GFlow = %.0f und GFhigh = %.0f
-
-</translation>
+        <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>HAFTUNGSAUSSCHLUSS / WARNUNG: DIES IST EINE NEUE IMPLEMENTIERUNG DES &quot;BÜHLMANN ZH-L16&quot;-ALGORITHMUS UND EINES DARAUF AUFBAUENDEN TAUCHGANGPLANERS, DIE NUR EINGESCHRÄNKT GETESTET WURDE. WIR RATEN DRINGENST, KEINE TAUCHGÄNGE DURCHZUFÜHREN, DIE NUR AUF DEN HIER ERSTELLTEN DATEN BERUHEN.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="530"/>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Tauchen auf %.*f %s in %d:%02d min - Gesamtzeit %d:%02u mit %s
-</translation>
+        <location filename="../planner.c" line="535"/>
+        <source>based on GFlow = %d and GFhigh = %d</source>
+        <translation>basierend auf GFlow = %d unf GFhigh = %d</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>Subsurface Tauchplan</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="542"/>
+        <source>depth</source>
+        <translation>Tiefe</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="545"/>
+        <source>runtime</source>
+        <translation>Laufzeit</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="548"/>
+        <source>duration</source>
+        <translation>Dauer</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="551"/>
+        <source>gas</source>
+        <translation>Gas</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>Übergang zu %.*f %s in %d:%02d min - Laufzeit %d:%02u auf %s</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>Verbleibe auf %.*f %s für %d:%02d min - Gesamtzeit %d:%02u mit %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="550"/>
-        <source>Switch gas to %s
-</source>
+        <location filename="../planner.c" line="606"/>
+        <source>%3.0f%s</source>
+        <translation>%3.0f%s</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
+        <source>%3dmin</source>
+        <translation>%3dmin</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="629"/>
+        <source>Switch gas to %s</source>
         <translation>Gaswechsel zu %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="558"/>
-        <source>Gas consumption:
-</source>
+        <location filename="../planner.c" line="638"/>
+        <source>Gas consumption:</source>
         <translation>Gasverbrauch:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="569"/>
-        <source>%.0f%s of %s
-</source>
-        <translation>%.0f%s %s
-</translation>
+        <location filename="../planner.c" line="658"/>
+        <location filename="../planner.c" line="663"/>
+        <location filename="../planner.c" line="686"/>
+        <source>Warning:</source>
+        <translation>Warnung:</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="659"/>
+        <source>this is more gas than available in the specified cylinder!</source>
+        <translation>Dies ist mehr Gas als im angegebenen Zylinder verfügbar ist!</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="664"/>
+        <source>not enough reserve for gas sharing on ascent!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="666"/>
+        <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
+        <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s während geplantem Aufstieg)</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="668"/>
+        <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
+        <translation>%.0f%s (%.0f%s während des geplanten Aufstiegs) von %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="810"/>
+        <location filename="../planner.c" line="683"/>
+        <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
+        <translation>hoher pO₂ Wert %.2f auf %d:%02u mit Gas %s in Tiefe %.*f %s</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="980"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1226"/>
+        <location filename="../profile.c" line="1250"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3356,70 +3760,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1229"/>
+        <location filename="../profile.c" line="1253"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1233"/>
+        <location filename="../profile.c" line="1257"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1263"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </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>AMV: %2.1fl/min
+        <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1244"/>
+        <location filename="../profile.c" line="1268"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1246"/>
+        <location filename="../profile.c" line="1270"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1272"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="1274"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="1277"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1260"/>
+        <location filename="../profile.c" line="1284"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3428,7 +3832,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1264"/>
+        <location filename="../profile.c" line="1288"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3437,402 +3841,395 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1276"/>
+        <location filename="../profile.c" line="1300"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Sicherheitsstop: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1279"/>
+        <location filename="../profile.c" line="1303"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Sicherheitsstop: unbek. Zeit @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="1308"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
+        <location filename="../profile.c" line="1311"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deko: unbek. Zeit @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1291"/>
+        <location filename="../profile.c" line="1315"/>
         <source>In deco
 </source>
         <translation>In Deko
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1293"/>
+        <location filename="../profile.c" line="1317"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1297"/>
+        <location filename="../profile.c" line="1321"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1305"/>
+        <location filename="../profile.c" line="1329"/>
         <source>In deco (calc)
 </source>
         <translation>Deko (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1307"/>
+        <location filename="../profile.c" line="1331"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1310"/>
+        <location filename="../profile.c" line="1334"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1313"/>
+        <location filename="../profile.c" line="1337"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Berechneter tiefster Deko-Stopp %.0f %s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1319"/>
+        <location filename="../profile.c" line="1343"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Gewebe %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1325"/>
+        <location filename="../profile.c" line="1349"/>
         <source>heartbeat: %d
 </source>
         <translation>Herzschlag: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1327"/>
+        <location filename="../profile.c" line="1351"/>
         <source>bearing: %d
 </source>
         <translation>Peilung: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1419"/>
+        <location filename="../profile.c" line="1443"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</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>%s %sTiefe:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1435"/>
+        <location filename="../profile.c" line="1459"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sTiefe:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1439"/>
+        <location filename="../profile.c" line="1463"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</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>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1454"/>
+        <location filename="../profile.c" line="1478"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sDruck:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="273"/>
+        <location filename="../qt-gui.cpp" line="281"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="276"/>
+        <location filename="../qt-gui.cpp" line="284"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="392"/>
-        <source>%1, %2 %3, %4 %5:%6</source>
-        <translation>%1, %2 %3, %4 %5:%6</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="405"/>
-        <source>%1 %2, %3
-%4:%5</source>
-        <translation>%1 %2, %3
-%4:%5</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="418"/>
+        <location filename="../qt-gui.cpp" line="417"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 Tauchgänge)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="423"/>
+        <location filename="../qt-gui.cpp" line="422"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 Tauchgang)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>boat</source>
         <translation>Boot</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>shore</source>
         <translation>Ufer</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>drift</source>
         <translation>Strömung</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>deep</source>
         <translation>tief</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>cavern</source>
         <translation>Kaverne</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>ice</source>
         <translation>Eis</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>wreck</source>
         <translation>Wrack</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>cave</source>
         <translation>Höhle</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>altitude</source>
         <translation>Berg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>pool</source>
         <translation>Pool</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>lake</source>
         <translation>See</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>river</source>
         <translation>Fluss</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>night</source>
         <translation>Nacht</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>fresh</source>
-        <translation>süß</translation>
+        <translation>süss</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>student</source>
         <translation>Schüler</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>photo</source>
         <translation>Foto</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>video</source>
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>instructor</source>
-        <translation>Ausbilder</translation>
+        <translation>Instruktor</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="25"/>
         <source>deco</source>
         <translation>deko</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="216"/>
+        <location filename="../dive.c" line="133"/>
+        <source>ℓ</source>
+        <translation>ℓ</translation>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="214"/>
         <source>more than %d days</source>
         <translation>mehr als %d Tage</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="220"/>
         <source>%dd %dh %dmin</source>
-        <translation>%dt %dh %dmin</translation>
+        <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="224"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="235"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation>für Tauchgänge Nr.</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="242"/>
+        <location filename="../statistics.c" line="240"/>
         <source>for selected dives</source>
         <translation>für die ausgewählten Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="275"/>
         <source>for dive #%d</source>
         <translation>für Tauchgang Nr. %d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for selected dive</source>
         <translation>für den ausgewählten Tauchgang</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for all dives</source>
         <translation>für alle Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="283"/>
+        <location filename="../statistics.c" line="281"/>
         <source>(no dives)</source>
         <translation>(keine Tauchgänge)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sun</source>
         <translation>So</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Mon</source>
         <translation>Mo</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Tue</source>
         <translation>Di</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Wed</source>
         <translation>Mi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Thu</source>
         <translation>Do</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Fri</source>
         <translation>Fr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sat</source>
         <translation>Sa</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Mar</source>
         <translation>Mär</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Dec</source>
         <translation>Dez</translation>
     </message>
@@ -3862,97 +4259,97 @@ Is the Uemis Zurich plugged in correctly?</source>
 Ist der Uemis Zürich korrekt verbunden?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="107"/>
+        <location filename="../uemis-downloader.c" line="111"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="379"/>
+        <location filename="../uemis-downloader.c" line="383"/>
         <source>Reading %s %s</source>
         <translation>Lese %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="399"/>
+        <location filename="../uemis-downloader.c" line="403"/>
         <source>data</source>
         <translation>Daten</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="420"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>divelog entry id</source>
         <translation>Logbucheintrag mit ID</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="422"/>
+        <location filename="../uemis-downloader.c" line="426"/>
         <source>divespot data id</source>
         <translation>Tauchplatz Daten ID</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
+        <location filename="../uemis-downloader.c" line="428"/>
         <source>more data dive id</source>
         <translation>mehr Daten für Tauchgang ID</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>wetsuit</source>
         <translation>Nass-Tauchanzug</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>semidry</source>
         <translation>halbtrocken</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>drysuit</source>
         <translation>Trockentauchanzug</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>shorty</source>
         <translation>Shorty</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>vest</source>
         <translation>Weste</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>long john</source>
         <translation>Latzhose</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>jacket</source>
         <translation>Jacke</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>full suit</source>
         <translation>vollständiger Tauchanzug</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>2 pcs full suit</source>
         <translation>Zweiteiler</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="620"/>
+        <location filename="../uemis-downloader.c" line="624"/>
         <source>membrane</source>
         <translation>Membran</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="802"/>
+        <location filename="../uemis-downloader.c" line="823"/>
         <source>Init Communication</source>
         <translation>Verbindung aufbauen</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="804"/>
+        <location filename="../uemis-downloader.c" line="825"/>
         <source>Uemis init failed</source>
         <translation>Uemis-Initialisierung fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="815"/>
+        <location filename="../uemis-downloader.c" line="836"/>
         <source>Start download</source>
         <translation>Beginne zu Laden</translation>
     </message>
@@ -3973,17 +4370,17 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="203"/>
-        <source>PO2 Green Warning</source>
+        <source>pO₂ Green Warning</source>
         <translation>Warnung: PO₂ Grün</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
-        <source>PO2 Ascend Warning</source>
+        <source>pO₂ Ascend Warning</source>
         <translation>Warnung: Aufstieg / PO₂</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="208"/>
-        <source>PO2 Ascend Alarm</source>
+        <source>pO₂ Ascend Alarm</source>
         <translation>Alarm: Aufstieg / PO₂</translation>
     </message>
     <message>
@@ -4009,7 +4406,7 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
     <message>
         <location filename="../uemis.c" line="220"/>
         <source>Depth Limit Exceeded</source>
-        <translation>Tiefenbegrenzung überschritten</translation>
+        <translation>Tiefenlimit überschritten</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="222"/>
@@ -4046,5 +4443,214 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
         <source>Low Battery Alert</source>
         <translation>Alarm: Batterie schwach</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>Kann Datei %s nicht öffnen</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="36"/>
+        <source>Date:</source>
+        <translation>Datum:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="38"/>
+        <source>Time:</source>
+        <translation>Zeit:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="40"/>
+        <source>Duration:</source>
+        <translation>Dauer:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="41"/>
+        <source>min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="43"/>
+        <source>Max Depth:</source>
+        <translation>Max. Tiefe:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="46"/>
+        <source>Air Temp:</source>
+        <translation>Lufttemp.:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="48"/>
+        <source>Water Temp:</source>
+        <translation>Wasser Temp : </translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="50"/>
+        <source>Location:</source>
+        <translation>Ort:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="54"/>
+        <source>Notes:</source>
+        <translation>Notizen:</translation>
+    </message>
+</context>
+<context>
+    <name>plannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formular</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="35"/>
+        <source>Rates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="56"/>
+        <source>Ascent</source>
+        <translation>Aufstieg</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="77"/>
+        <source>below 75% avg. depth</source>
+        <translation>unter 75% mittlerer Tiefe</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>m/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="94"/>
+        <source>75%-50% avg. depth</source>
+        <translation>75%-50% mittlerer Tiefe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="111"/>
+        <source>50% avg. depth - 6m/20ft</source>
+        <translation>50% mitlerer Tiefe - 6m/20ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="128"/>
+        <source>6m/20ft to surface</source>
+        <translation>6m/20ft zur Oberfläche</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="148"/>
+        <source>Descent</source>
+        <translation>Abstieg</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="200"/>
+        <source>surface to the bottom</source>
+        <translation>Von der Oberfläche zum Grund</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="226"/>
+        <source>Planning</source>
+        <translation>Planung</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="247"/>
+        <source>GF low</source>
+        <translation>GF low</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="264"/>
+        <source>GF high</source>
+        <translation>GF high</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
+        <source>Drop to first depth</source>
+        <translation>Direkter Abstieg zur ersten Tiefe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
+        <source>Last Stop at 6m/20ft</source>
+        <translation>Letzter Stop auf 6m/20ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>plan backgas breaks</source>
+        <translation>plane backgas Pausen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="318"/>
+        <source>Gas Options</source>
+        <translation>Gas Optionen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <source>bottom SAC</source>
+        <translation>Grund AMV</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="349"/>
+        <source>deco SAC</source>
+        <translation>Deko AMV</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="359"/>
+        <source>bottom pO₂</source>
+        <translation>Grund pO₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="389"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="382"/>
+        <source>deco pO₂</source>
+        <translation>Deko pO₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="421"/>
+        <source>Dive Notes</source>
+        <translation>Notizen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+        <source>In dive plan, show runtime (absolute time) of stops</source>
+        <translation>Im Tauchplan, zeige Laufzeit (absolute Zeit) der Stops</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="445"/>
+        <source>display runtime</source>
+        <translation>Zeige Laufzeit</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="458"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
+        <translation>Im Tauchplan, zeige Dauer (relative Zeit) der Stops</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="461"/>
+        <source>display segment duration</source>
+        <translation>Zeige Segmentdauer</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="471"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
+        <translation>Im Tauchplan, zeige Übergänge oder behandle sie als Implizit</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="474"/>
+        <source>display transitions in deco</source>
+        <translation>zeige Übergänge in Deko</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="481"/>
+        <source>verbatim diveplan</source>
+        <translation>wörtlicher Tauchplan</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_el_GR.ts b/translations/subsurface_el_GR.ts
index 1e84b5812..927af4132 100644
--- a/translations/subsurface_el_GR.ts
+++ b/translations/subsurface_el_GR.ts
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="el_GR">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="el_GR" version="2.0">
+<defaultcodec>UTF-8</defaultcodec>
 <context>
     <name>CylindersModel</name>
     <message>
@@ -39,43 +38,43 @@
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="71"/>
+        <location filename="../qt-ui/models.cpp" line="70"/>
         <source>Switch at</source>
         <translation>Αλλαγή στα</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>Πατώντας εδώ θα διαγραφή αυτή η φιάλη.</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>Η φιάλη δεν μπορεί να διαγραφεί</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>Αυτό το αέριο είναι σε χρήση. Μόνο φιάλες που δεν χρησιμοποιούνται
 μπορούν να διαγραφούν</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="507"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="508"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="527"/>
+        <location filename="../qt-ui/models.cpp" line="532"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="528"/>
+        <location filename="../qt-ui/models.cpp" line="533"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -103,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>Μοντέλο</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Device ID</source>
         <translation>ID Συσκευής</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Nickname</source>
         <translation>Όνομα</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>Πατώντας εδώ θα διαγραφεί αυτός ο υπολογιστής κατάδυσης.</translation>
     </message>
@@ -126,190 +125,326 @@
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="90"/>
-        <source>air</source>
-        <translation>αέρας</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="92"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</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>Bailing out σε ανοικτό κύκλωμα</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>έναρξη</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>λήξη</translation>
     </message>
 </context>
 <context>
-    <name>DiveGasPressureItem</name>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="475"/>
-        <source>air</source>
-        <translation>αέρας</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="476"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-</context>
-<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1258"/>
-        <source> l/min</source>
-        <translation>l/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
-        <source> cuft/min</source>
-        <translation>cuft/min</translation>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <source>/min</source>
+        <translation>/min</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>Εμφάνιση Πεδίου Αναζήτησης</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="706"/>
         <source>expand all</source>
         <translation>επέκταση όλων</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="740"/>
+        <location filename="../qt-ui/divelistview.cpp" line="707"/>
         <source>collapse all</source>
         <translation>σύμπτυξη όλων</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="741"/>
+        <location filename="../qt-ui/divelistview.cpp" line="708"/>
         <source>collapse others</source>
         <translation>Σύμπτυξη των άλλων</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>αφαίρεση κατάδυσης(-σεων) από το ταξίδι</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>δημιουργία νέου ταξιδιού από πάνω</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>προσθήκη κατάδυσης(σεων) στο ταξίδι αμέσως από πάνω</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>
+        <translation type="unfinished"/>
     </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>συγχώνευση με το ταξίδι από πάνω</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>συγχώνευση με το ταξίδι από κάτω</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>διαγραφή κατάδυσης(-σεων)</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>σημειώστε την κατάδυση(σεις) ως άκυρη</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
-        <source>save As</source>
-        <translation>αποθήκευση ως...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="763"/>
-        <source>export As UDDF</source>
-        <translation>εξαγωγή ως UDDF</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="764"/>
-        <source>export As CSV</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/divelistview.cpp" line="744"/>
+        <source>renumber dive(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="765"/>
+        <location filename="../qt-ui/divelistview.cpp" line="745"/>
         <source>shift times</source>
         <translation>αλλαγή χρόνων</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="766"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>load images</source>
         <translation>Φόρτωση εικόνων</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="769"/>
-        <source>upload dive(s) to divelogs.de</source>
-        <translation>μεταφόρτωση κατάδυσης(σεων) στο divelogs.de</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Open Image Files</source>
+        <translation>Άνοιγμα αρχείων εικόνων</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation>Αρχεία εικόνων (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <source>merge selected dives</source>
+        <translation>συγχώνευση επιλεγμένων καταδύσεων</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="24"/>
+        <source>General Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="30"/>
+        <source>Export format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="42"/>
+        <source>Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="61"/>
+        <source>UDDF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="74"/>
+        <source>divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="84"/>
+        <source>CSV</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="94"/>
+        <source>Worldmap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="107"/>
+        <source>Selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="116"/>
+        <source>Selected dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="126"/>
+        <source>All dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="178"/>
+        <source>HTML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="184"/>
+        <source>General Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="190"/>
+        <source>Subsurface Numbers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="203"/>
+        <source>Selected Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="216"/>
+        <source>Minimum Javascript</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="229"/>
+        <source>All Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="239"/>
+        <source>Export List only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="252"/>
+        <source>Style Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="264"/>
+        <source>Font</source>
+        <translation>Γραμματοσειρά</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="274"/>
+        <source>Font size</source>
+        <translation>Μέγεθος Γραμματοσειράς</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
+        <source>8</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <source>10</source>
+        <translation>10</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <source>12</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <source>14</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <source>16</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <source>18</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <source>20</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="323"/>
+        <source>Theme</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="795"/>
-        <source>Save Dives As...</source>
-        <translation>Αποθήκευση Καταδύσεων ως...</translation>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <source>Sand</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="814"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="153"/>
         <source>Export UDDF File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>UDDF αρχεία (*.uddf *.UDDF)</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Open Image Files</source>
-        <translation>Άνοιγμα αρχείων εικόνων</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="162"/>
+        <source>Export World Map</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
-        <translation>Αρχεία εικόνων (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="163"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="177"/>
+        <source>HTML files (*.html)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="760"/>
-        <source>merge selected dives</source>
-        <translation>συγχώνευση επιλεγμένων καταδύσεων</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="167"/>
+        <source>Export Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="168"/>
+        <source>XML files (*.xml *.ssrf)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="176"/>
+        <source>Export HTML files as</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -317,141 +452,136 @@
     <message>
         <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
         <source>Import dive log file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>Διαχωριστής Πεδίου</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>Προρυθμισμένες εισαγωγές</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>Ρυθμίσεις Πεδίου</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="80"/>
         <source>Depth</source>
         <translation>Βάθος</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="100"/>
         <source>Stopdepth</source>
         <translation>Stopdepth</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="107"/>
         <source>PO2</source>
         <translation>PO2</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>Ώρα</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="121"/>
         <source>Temp</source>
         <translation>Θερμοκρασία</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="151"/>
         <source>Cns</source>
         <translation>Cns</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>Μονάδες Μέτρησης</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>Μετρικό</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>Imperial</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="317"/>
         <source>Date</source>
         <translation>Ημερομηνία</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="385"/>
         <source>Duration</source>
         <translation>Διάρκεια</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="470"/>
         <source>Tags</source>
         <translation>Ετικέτες</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
         <source>Location</source>
         <translation>Τοποθεσία</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="300"/>
         <source>Max depth</source>
         <translation>Μέγιστο βάθος</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="334"/>
         <source>Mean depth</source>
         <translation>Ενδιάμεσο βάθος</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="368"/>
         <source>Buddy</source>
         <translation>Ζευγάρι</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="402"/>
         <source>Notes</source>
         <translation>Σημειώσεις</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="436"/>
         <source>Weight</source>
         <translation>Βάρος</translation>
     </message>
@@ -459,105 +589,70 @@
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="71"/>
-        <source>Bottom SAC</source>
-        <translation>SAC Βυθού</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="106"/>
+        <source>Planned Dive Time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="85"/>
-        <source>SAC on DECO Stop</source>
-        <translation>SAC στη στάση αποσυμπίεσης</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="134"/>
+        <source>Altitude</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="78"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="98"/>
-        <source>GFLow</source>
-        <translation>GFLow</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="125"/>
-        <source>Last Stop at 6m</source>
-        <translation>Τελευταία Στάση στα 6m</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="174"/>
-        <source>Start Time</source>
-        <translation>Ώρα Έναρξης</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="181"/>
+        <location filename="../qt-ui/diveplanner.ui" line="141"/>
         <source>ATM Pressure</source>
         <translation>Πίεση ATM</translation>
     </message>
-</context>
-<context>
-    <name>DivePlannerGraphics</name>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="114"/>
-        <source>10m</source>
-        <translation>10m</translation>
-    </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="116"/>
-        <source>30ft</source>
-        <translation>30ft</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="148"/>
+        <source>mbar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="363"/>
-        <source>Handler Position Error</source>
-        <translation>Handler Position Error</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>
-        <translation>Μία ή περισσότερες στάσεις θα χαθούν,
-Παρακαλώ, πρώτα αφαιρέστε τις.</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="158"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="445"/>
-        <source>AIR</source>
-        <translation>AIR</translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="137"/>
+        <source>unknown</source>
+        <translation>άγνωστο</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1148"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="586"/>
         <source>Final Depth</source>
         <translation>Τελικό Βάθος</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1152"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="590"/>
         <source>Duration</source>
         <translation>Διάρκεια</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1154"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="592"/>
         <source>Used Gas</source>
         <translation>Χρησιμοποιημένο Αέριο</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>CC Set Point</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>Απόρριψη του Πλάνου;</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>Είστε έτοιμοι να απορρίψετε το Πλάνο.</translation>
     </message>
@@ -565,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>Πόντοι Dive Planner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="256"/>
         <source>Available Gases</source>
         <translation>Διαθέσιμα Αέρια</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>add dive data point</translation>
     </message>
@@ -610,113 +705,113 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
         <source>User Entered</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
         <source>Cylinder Index</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
-        <source>Pressure  S</source>
-        <translation type="unfinished"></translation>
+        <source>Pressure S</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <source>pN₂</source>
+        <translation>pN₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>pHe</source>
+        <translation>pHe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Pressure I</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
         <source>Ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
-        <source>PN2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <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="119"/>
-        <source>PO2</source>
-        <translation>PO2</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>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>date</source>
         <translation>ημερομηνία</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1298"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
+        <location filename="../qt-ui/models.cpp" line="1307"/>
         <source>suit</source>
         <translation>στολή</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1310"/>
         <source>cyl</source>
         <translation>φιάλη</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1344"/>
+        <location filename="../qt-ui/models.cpp" line="1325"/>
         <source>location</source>
         <translation>τοποθεσία</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1316"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1338"/>
+        <location filename="../qt-ui/models.cpp" line="1319"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1341"/>
+        <location filename="../qt-ui/models.cpp" line="1322"/>
         <source>maxCNS</source>
         <translation>maxCNS</translation>
     </message>
@@ -724,115 +819,115 @@ 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>Άκυρη απάντηση από τον σέρβερ</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>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</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>Expected XML tag &apos;DiveDates&apos; not found</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>Malformed XML response. Line %1: %2</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>καμία κατάδυση δεν έχει επιλεγεί</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="181"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="179"/>
         <source>internal error</source>
         <translation>εσωτερικό σφάλμα</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>Done</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>Μεταφόρτωση λίστας καταδύσεων...</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>Λήψη λίστας καταδύσεων...</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>Λήψη %1 καταδύσων...</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>Η λήψη τελείωσε - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
         <source>Corrupted download</source>
         <translation>Κατεστραμμένη λήψη</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>Το αρχείο αυτό δεν μπορούσε να ανοιχθεί:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Upload failed</source>
         <translation>Η μεταφόρτωση απέτυχε</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="849"/>
         <source>Upload successful</source>
         <translation>Η μεταφόρτωση πέτυχε</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="854"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="852"/>
         <source>Login failed</source>
         <translation>Login failed</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>Cannot parse response</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="868"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Error: %1</source>
         <translation>Σφάλμα: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="835"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/>
         <source>Upload finished</source>
         <translation>Η μεταφόρτωση τελείωσε</translation>
     </message>
@@ -840,54 +935,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>ΟΚ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="165"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/>
         <source>Error</source>
         <translation>Σφάλμα</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>Επανάληψη</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>
+        <translation type="unfinished"/>
     </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>Επιλέξτε το αρχείο για το logfile της λήψης από τον υπολογιστή κατάδυσης</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>Log files (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="339"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
         <source>Warning</source>
         <translation>Προειδοποίηση</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>Saving the libdivecomputer dump will NOT download dives to the dive list.</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>Επιλέξτε αρχείο για το binary dump file του υπολογιστή κατάδυσης</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>Dump files (*.bin)</translation>
     </message>
@@ -955,7 +1050,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>Επεξεργασία Επιλεγμένων Τοποθεσιών Κατάδυσης</translation>
     </message>
@@ -964,845 +1059,851 @@ 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>Σημειώσεις</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>Τοποθεσία</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="148"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Coordinates</source>
         <translation>Συντεταγμένες</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="169"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="155"/>
+        <location filename="../qt-ui/maintab.ui" line="148"/>
         <source>Buddy</source>
         <translation>Ζευγάρι</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="63"/>
-        <source>Start time</source>
-        <translation>Ώρα Έναρξης</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>Εξωτερική Θερμοκρασία</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>Θερμοκρασία Νερού</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="127"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Tags</source>
         <translation>Ετικέτες</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="223"/>
         <source>Rating</source>
         <translation>Βαθμός</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="236"/>
         <source>Visibility</source>
         <translation>Ορατότητα</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="215"/>
+        <location filename="../qt-ui/maintab.ui" line="127"/>
         <source>Suit</source>
         <translation>Στολή</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>Σημειώσεις</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="270"/>
+        <location filename="../qt-ui/maintab.ui" line="311"/>
         <source>Equipment</source>
         <translation>Εξοπλισμός</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="350"/>
+        <location filename="../qt-ui/maintab.ui" line="391"/>
         <source>Dive Info</source>
         <translation>Πληροφορίες</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>Ημερομηνία</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="414"/>
+        <location filename="../qt-ui/maintab.ui" line="275"/>
+        <source>Time</source>
+        <translation>Ώρα</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="455"/>
         <source>Interval</source>
         <translation>Διάλειμμα</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="433"/>
+        <location filename="../qt-ui/maintab.ui" line="474"/>
         <source>Gases Used</source>
         <translation>Αέρια που χρησιμοποιήθηκαν</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="452"/>
+        <location filename="../qt-ui/maintab.ui" line="493"/>
         <source>Gas Consumed</source>
         <translation>Αέριο που καταναλώθηκε</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>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="531"/>
         <source>Max. Depth</source>
         <translation>Μέγιστο Βάθος</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="509"/>
+        <location filename="../qt-ui/maintab.ui" line="550"/>
         <source>Ave. Depth</source>
         <translation>Μέσο Βάθος</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="528"/>
+        <location filename="../qt-ui/maintab.ui" line="569"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="547"/>
+        <location filename="../qt-ui/maintab.ui" line="588"/>
         <source>Air Pressure</source>
         <translation>Ατμοσφαιρική Πίεση</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="566"/>
+        <location filename="../qt-ui/maintab.ui" line="607"/>
         <source>Air Temperature</source>
         <translation>Εξωτερική Θερμοκρασία</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="585"/>
+        <location filename="../qt-ui/maintab.ui" line="626"/>
         <source>Water Temperature</source>
         <translation>Θερμοκρασία Νερού</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="604"/>
+        <location filename="../qt-ui/maintab.ui" line="645"/>
         <source>Dive Time</source>
         <translation>Διάρκεια Κατάδυσης</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="623"/>
+        <location filename="../qt-ui/maintab.ui" line="664"/>
         <source>Salinity</source>
         <translation>Αλμυρότητα</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="660"/>
+        <location filename="../qt-ui/maintab.ui" line="701"/>
         <source>Stats</source>
         <translation>Στατιστικά</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="746"/>
         <source>Depth</source>
         <translation>Βάθος</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Temperature</source>
         <translation>Θερμοκρασία</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="784"/>
         <source>Duration</source>
         <translation>Διάρκεια</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Total Time</source>
         <translation>Συνολική Διάρκεια</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="835"/>
         <source>Dives</source>
         <translation>Καταδύσεις</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="919"/>
+        <source>Photos</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="89"/>
         <source>Cylinders</source>
         <translation>Φιάλες</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="90"/>
         <source>Add Cylinder</source>
         <translation>Προσθήκη Φιάλης</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="93"/>
         <source>Weights</source>
         <translation>Βάρη</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>Προσθήκη Βαρών</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="438"/>
+        <location filename="../qt-ui/maintab.cpp" line="409"/>
         <source>Trip Location</source>
         <translation>Τοποθεσία Ταξιδιού</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>Σημειώσεις Ταξιδιού</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="42"/>
+        <location filename="../qt-ui/maintab.cpp" line="48"/>
         <source>Save</source>
         <translation>Αποθήκευση</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="46"/>
+        <location filename="../qt-ui/maintab.cpp" line="52"/>
         <source>Cancel</source>
         <translation>Ακύρωση</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>Το ταξίδι αυτό επεξεργάζεται αυτή τη στιγμή.</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>Πολλαπλές καταδύσεις επεξεργάζονται αυτή τη στιγμή.</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>Η κατάδυση επεξεργάζεται αυτή τη στιγμή.</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>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="494"/>
+        <location filename="../qt-ui/maintab.cpp" line="464"/>
         <source>unknown</source>
         <translation>άγνωστο</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>N</source>
-        <translation>N</translation>
+        <location filename="../qt-ui/maintab.cpp" line="501"/>
+        <source>Deepest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>S</source>
-        <translation>S</translation>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <source>Shallowest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>E</source>
-        <translation>E</translation>
+        <location filename="../qt-ui/maintab.cpp" line="794"/>
+        <source>Discard the Changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>W</source>
-        <translation>W</translation>
+        <location filename="../qt-ui/maintab.cpp" line="795"/>
+        <source>You are about to discard your changes.</source>
+        <translation type="unfinished"/>
     </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>Φίλτρο</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="571"/>
+        <location filename="../qt-ui/mainwindow.ui" line="646"/>
         <source>&amp;File</source>
         <translation>&amp;File</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="583"/>
+        <source>Print</source>
+        <translation>Εκτύπωση</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:'Courier'; 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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="606"/>
+        <location filename="../qt-ui/mainwindow.ui" line="679"/>
         <source>&amp;View</source>
         <translation>&amp;View</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="628"/>
+        <location filename="../qt-ui/mainwindow.ui" line="701"/>
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="636"/>
+        <location filename="../qt-ui/mainwindow.ui" line="709"/>
         <source>&amp;Import</source>
         <translation>&amp;Import</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>&amp;New logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="655"/>
+        <location filename="../qt-ui/mainwindow.ui" line="728"/>
         <source>New</source>
         <translation>Νέο</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="658"/>
+        <location filename="../qt-ui/mainwindow.ui" line="731"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</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>&amp;Open logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="666"/>
+        <location filename="../qt-ui/mainwindow.ui" line="739"/>
         <source>Open</source>
         <translation>Άνοιγμα</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <location filename="../qt-ui/mainwindow.ui" line="742"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="674"/>
+        <location filename="../qt-ui/mainwindow.ui" line="747"/>
         <source>&amp;Save</source>
         <translation>&amp;Save</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="677"/>
+        <location filename="../qt-ui/mainwindow.ui" line="750"/>
         <source>Save</source>
         <translation>Αποθήκευση</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="680"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>Save as</source>
         <translation>Αποθήκευση ως...</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>Ctrl+Shift+S</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>Έ&amp;ξοδος</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Close</source>
         <translation>Κλείσιμο</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="702"/>
+        <location filename="../qt-ui/mainwindow.ui" line="775"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="902"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <source>P&amp;references</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="831"/>
+        <source>&amp;Add Dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <source>Auto &amp;Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="863"/>
+        <source>&amp;Dive List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="871"/>
+        <source>&amp;Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="879"/>
+        <source>&amp;Info</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="887"/>
+        <source>&amp;All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="895"/>
+        <source>P&amp;rev DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="903"/>
+        <source>&amp;Next DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="911"/>
+        <source>&amp;Select Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <source>&amp;About Subsurface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="937"/>
+        <source>&amp;Globe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="953"/>
+        <source>&amp;Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="959"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="707"/>
-        <source>Export &amp;UDDF</source>
-        <translation>Εξαγωγή σε &amp;UDDF</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="1008"/>
+        <source>&amp;Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1011"/>
+        <source>Export Dive Logs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1014"/>
+        <source>Ctrl+E</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Enable the pN2 Graph</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <location filename="../qt-ui/mainwindow.ui" line="128"/>
         <source>Enable the pHe graph</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <location filename="../qt-ui/mainwindow.ui" line="290"/>
         <source>Show/hide heart rate</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <location filename="../qt-ui/mainwindow.ui" line="342"/>
         <source>Enable EAD, END, and EADD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="238"/>
         <source>Show NDL / TTS</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="456"/>
+        <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="710"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="715"/>
-        <source>Export HTML World Map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="718"/>
-        <source>Ctrl+H</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="723"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>&amp;Print</source>
         <translation>Εκτύ&amp;πωση</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="734"/>
+        <location filename="../qt-ui/mainwindow.ui" line="791"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="742"/>
+        <location filename="../qt-ui/mainwindow.ui" line="799"/>
         <source>&amp;Quit</source>
         <translation>Έ&amp;ξοδος</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="753"/>
+        <location filename="../qt-ui/mainwindow.ui" line="810"/>
         <source>Import from &amp;dive computer</source>
         <translation>Εισαγωγή από &amp;υπολογιστή κατάδυσης</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="818"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation>Εισαγωγή δεδομένων &amp;GPS από την υπηrεσία Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="764"/>
+        <location filename="../qt-ui/mainwindow.ui" line="821"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="826"/>
         <source>&amp;Edit Device Names</source>
         <translation>&amp;Επεξεργασία Ονομάτων Συσκευών</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="834"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="782"/>
+        <location filename="../qt-ui/mainwindow.ui" line="839"/>
         <source>&amp;Renumber</source>
         <translation>Επ&amp;αναρίθμηση</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="785"/>
+        <location filename="../qt-ui/mainwindow.ui" line="842"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="798"/>
+        <location filename="../qt-ui/mainwindow.ui" line="855"/>
         <source>&amp;Yearly Statistics</source>
         <translation>&amp;Ετήσια Στατιστικά</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="801"/>
+        <location filename="../qt-ui/mainwindow.ui" line="858"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="806"/>
-        <source>Dive List</source>
-        <translation>Λίστα Καταδύσεων</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="814"/>
-        <source>Profile</source>
-        <translation>Προφίλ</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="822"/>
-        <source>Info</source>
-        <translation>Πληροφορίες</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="830"/>
-        <source>All</source>
-        <translation>Όλα</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="872"/>
+        <location filename="../qt-ui/mainwindow.ui" line="929"/>
         <source>User &amp;Manual</source>
         <translation>Εγχερίδιο &amp;Χρήσης</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="880"/>
-        <source>Globe</source>
-        <translation>Globe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="888"/>
+        <location filename="../qt-ui/mainwindow.ui" line="945"/>
         <source>P&amp;lan Dive</source>
         <translation>Σχε&amp;διασμός Κατάδυσης</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="891"/>
+        <location filename="../qt-ui/mainwindow.ui" line="948"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="907"/>
-        <source>Import from Divelogs.de</source>
-        <translation>Εισαγωγή από Divelogs.de</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1003"/>
         <source>&amp;Check for Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="951"/>
-        <source>Export CSV</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="726"/>
+        <location filename="../qt-ui/mainwindow.ui" line="783"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</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"/>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="131"/>
+        <location filename="../qt-ui/mainwindow.ui" line="157"/>
+        <location filename="../qt-ui/mainwindow.ui" line="186"/>
+        <location filename="../qt-ui/mainwindow.ui" line="215"/>
+        <location filename="../qt-ui/mainwindow.ui" line="241"/>
+        <location filename="../qt-ui/mainwindow.ui" line="267"/>
+        <location filename="../qt-ui/mainwindow.ui" line="293"/>
+        <location filename="../qt-ui/mainwindow.ui" line="319"/>
+        <location filename="../qt-ui/mainwindow.ui" line="345"/>
+        <location filename="../qt-ui/mainwindow.ui" line="371"/>
+        <location filename="../qt-ui/mainwindow.ui" line="397"/>
+        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>...</source>
         <translation>...</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>Προτιμήσεις</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="745"/>
+        <location filename="../qt-ui/mainwindow.ui" line="802"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="756"/>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="774"/>
-        <source>Add Dive</source>
-        <translation>Προσθήκη Κατάδυσης</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="793"/>
-        <source>Auto Group</source>
-        <translation>Αυτόματη Oμαδοποίηση</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="809"/>
+        <location filename="../qt-ui/mainwindow.ui" line="866"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="817"/>
+        <location filename="../qt-ui/mainwindow.ui" line="874"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <location filename="../qt-ui/mainwindow.ui" line="882"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="833"/>
+        <location filename="../qt-ui/mainwindow.ui" line="890"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="838"/>
-        <source>Prev DC</source>
-        <translation>Προηγ. DC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="841"/>
+        <location filename="../qt-ui/mainwindow.ui" line="898"/>
         <source>Left</source>
         <translation>Αριστερά</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="846"/>
-        <source>Next DC</source>
-        <translation>Επόμενο DC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="849"/>
+        <location filename="../qt-ui/mainwindow.ui" line="906"/>
         <source>Right</source>
         <translation>Δεξιά</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="854"/>
-        <source>Select Events</source>
-        <translation>Επιλογή Συμβάντων</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <location filename="../qt-ui/mainwindow.ui" line="916"/>
         <source>Input Plan</source>
         <translation>Εισαγωγή Πλάνου</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="864"/>
-        <source>About Subsurface</source>
-        <translation>Περί...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="875"/>
+        <location filename="../qt-ui/mainwindow.ui" line="932"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="883"/>
+        <location filename="../qt-ui/mainwindow.ui" line="940"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="896"/>
-        <source>Import Log Files</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/mainwindow.ui" line="956"/>
+        <source>Import divelog files from other applications</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="899"/>
-        <source>Import divelog files from other applications</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/mainwindow.ui" line="964"/>
+        <source>Import &amp;from Divelogs.de</source>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <location filename="../qt-ui/mainwindow.ui" line="978"/>
         <source>F11</source>
-        <translation type="unfinished">F11</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="174"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
         <source>Open File</source>
         <translation>Άνοιγμα Αρχείου</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>Παρακάλω αποθηκεύστε ή ακυρώστε την επεξεργασία της κατάδυσης πριν κλέισετε το αρχείο.</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>
-        <translation>Παρακάλω αποθηκεύστε ή ακυρώστε την επεξεργασία της κατάδυσης πριν προσπαθήσετε να σχεδιάσετε μια κατάδυση.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="396"/>
+        <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>Παρακάλω αποθηκεύστε ή ακυρώστε την επεξεργασία της κατάδυσης πριν προσπαθήσετε να προσθέσετε μια κατάδυση.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="645"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="419"/>
+        <source>Print runtime table</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="710"/>
         <source>Do you want to save the changes you made in the file %1?</source>
         <translation>Θέλετε να αποθηκευτούν οι αλλαγές του αρχείου %1;</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>Θέλετε να αποθηκευθούν οι αλλαγές του αρχείου δεδομένων;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="652"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="717"/>
         <source>Save Changes?</source>
         <translation>Αποθήκευση Αλλαγών;</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>Οι αλλαγές θα χαθούν αν δεν τις αποθηκεύσετε.</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>Αποθήκευση Αρχείου ως...</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>Προειδοποίηση</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>Παρακάλω αποθηκεύστε ή ακυρώστε την επεξεργασία της κατάδυσης πριν ανοίξετε ένα νέο αρχείο.</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>UDDF αρχεία (*.uddf *.UDDF)</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>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="300"/>
-        <source>HTML files (*.html)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="449"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="514"/>
         <source>Yearly Statistics</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="961"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1076"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1199"/>
         <source>Open Dive Log File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1107"/>
+        <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>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PlannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Last stop at 20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="416"/>
+        <source>Last stop at 6m</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1828,247 +1929,297 @@ Please, remove them first.</source>
         <translation>Γλώσσα</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="151"/>
         <source>Lists and Tables</source>
         <translation>Λίστες και Πίνακες</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font</source>
         <translation>Γραμματοσειρά</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="167"/>
         <source>Font size</source>
         <translation>Μέγεθος Γραμματοσειράς</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="170"/>
+        <location filename="../qt-ui/preferences.ui" line="180"/>
         <source>Dives</source>
         <translation>Καταδύσεις</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>Προεπιλεγμένο Αρχείο Καταδύσεων</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="188"/>
+        <location filename="../qt-ui/preferences.ui" line="198"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="197"/>
+        <location filename="../qt-ui/preferences.ui" line="207"/>
         <source>Display Invalid</source>
         <translation>Εμφάνιση Άκυρου</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="214"/>
+        <location filename="../qt-ui/preferences.ui" line="224"/>
         <source>Default Cylinder</source>
         <translation>Προεπιλεγμένη Φιάλη</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>Χρήση Προεπιλεγμένης Φιάλης</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <source>Clear all settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="312"/>
+        <source>Reset all settings to their default value</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
         <source>System</source>
         <translation>Σύστημα</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="348"/>
         <source>Metric</source>
         <translation>Μετρικό</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="333"/>
+        <location filename="../qt-ui/preferences.ui" line="358"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="343"/>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
         <source>Personalize</source>
         <translation>Προσαρμογή</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="392"/>
         <source>Depth</source>
         <translation>Βάθος</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="374"/>
+        <location filename="../qt-ui/preferences.ui" line="399"/>
         <source>meter</source>
         <translation>μέτρα</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="409"/>
         <source>feet</source>
         <translation>πόδια</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="401"/>
+        <location filename="../qt-ui/preferences.ui" line="426"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="411"/>
+        <location filename="../qt-ui/preferences.ui" line="436"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="428"/>
+        <location filename="../qt-ui/preferences.ui" line="453"/>
         <source>liter</source>
         <translation>λίτρα</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="438"/>
+        <location filename="../qt-ui/preferences.ui" line="463"/>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="455"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="465"/>
+        <location filename="../qt-ui/preferences.ui" line="490"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="482"/>
+        <location filename="../qt-ui/preferences.ui" line="507"/>
         <source>kg</source>
         <translation>kg</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="811"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="636"/>
-        <source>max ppO₂ when showing MOD</source>
-        <translation type="unfinished"></translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="817"/>
+        <source>Proxy type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="830"/>
+        <source>Host</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="657"/>
+        <location filename="../qt-ui/preferences.ui" line="856"/>
+        <source>Port</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="882"/>
+        <source>Requires authentication</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="925"/>
+        <source>Password</source>
+        <translation>Κωδικός</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="682"/>
         <source>draw dive computer reported ceiling red</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="747"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>System Default</source>
         <translation>Προεπιλογή Συστήματος</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="767"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>Filter</source>
         <translation>Φίλτρο</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="419"/>
         <source>Pressure</source>
         <translation>Πίεση</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="421"/>
+        <location filename="../qt-ui/preferences.ui" line="446"/>
         <source>Volume</source>
         <translation>Όγκος</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="448"/>
+        <location filename="../qt-ui/preferences.ui" line="473"/>
         <source>Temperature</source>
         <translation>Θερμοκρασία</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="475"/>
+        <location filename="../qt-ui/preferences.ui" line="500"/>
         <source>Weight</source>
         <translation>Βάρος</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="517"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="507"/>
+        <location filename="../qt-ui/preferences.ui" line="532"/>
         <source>Time units</source>
         <translation>Μονάδες Μέτρησης Χρόνου</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>Παρανομαστής Ταχύτητας Ανόδου/Καθόδου</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="520"/>
+        <location filename="../qt-ui/preferences.ui" line="545"/>
         <source>Minutes</source>
         <translation>Λεπτά (min)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="530"/>
+        <location filename="../qt-ui/preferences.ui" line="555"/>
         <source>Seconds</source>
         <translation>Δευτερόλεπτα (sec)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="562"/>
+        <location filename="../qt-ui/preferences.ui" line="587"/>
         <source>Show</source>
         <translation>Εμφάνιση</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="693"/>
         <source>Show non-used cylinders in Equipment Tab</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>GFlow στο μέγιστο βάθος</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="691"/>
+        <location filename="../qt-ui/preferences.ui" line="716"/>
         <source>Misc</source>
         <translation>Διάφορα</translation>
     </message>
@@ -2078,35 +2229,65 @@ Please, remove them first.</source>
         <translation>Προτιμήσεις</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="697"/>
+        <location filename="../qt-ui/preferences.ui" line="722"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="739"/>
         <source>GFHigh</source>
         <translation>GFHigh</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="24"/>
+        <source>System proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="25"/>
+        <source>HTTP proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="26"/>
+        <source>SOCKS proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="245"/>
         <source>Restart required</source>
         <translation>Απαιτείται επανεκκίνηση</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>Για να φορτώσε σωστά μια γλώσσα πρέπει να επανεκκινήσεσε το Subsurface</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>Άνοιγμα προεπιλεγμένου Aρχείου Kαταγραφής (logfile)</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>Subsurface XML files (*.ssrf *.xml *.XML)</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="394"/>
+        <source>Warning</source>
+        <translation>Προειδοποίηση</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"/>
+    </message>
 </context>
 <context>
     <name>PrintDialog</name>
@@ -2247,72 +2428,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>άγνωστο</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>Κατάδυση #%1 - %2</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>Μέγιστο Βάθος: %1 %2</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>Διάρκεια: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1918"/>
+        <location filename="../qt-ui/models.cpp" line="1898"/>
         <source>Gas Used:</source>
         <translation>Αέριο που χρησιμοποιήθηκε:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1920"/>
+        <location filename="../qt-ui/models.cpp" line="1900"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1922"/>
+        <location filename="../qt-ui/models.cpp" line="1902"/>
         <source>Max. CNS:</source>
         <translation>Max. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1924"/>
+        <location filename="../qt-ui/models.cpp" line="1904"/>
         <source>Weights:</source>
         <translation>Βάρη:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1929"/>
+        <location filename="../qt-ui/models.cpp" line="1909"/>
         <source>Notes:</source>
         <translation>Σημειώσεις:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1936"/>
+        <location filename="../qt-ui/models.cpp" line="1916"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1938"/>
+        <location filename="../qt-ui/models.cpp" line="1918"/>
         <source>Buddy:</source>
         <translation>Ζευγάρι:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1940"/>
+        <location filename="../qt-ui/models.cpp" line="1920"/>
         <source>Suit:</source>
         <translation>Στολή:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1942"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>Viz:</source>
         <translation>Ορατότητα:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1944"/>
+        <location filename="../qt-ui/models.cpp" line="1924"/>
         <source>Rating:</source>
         <translation>Βαθμός:</translation>
     </message>
@@ -2320,75 +2501,90 @@ 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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/>
+        <source>Make first divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="906"/>
+        <source>Delete this divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="913"/>
         <source>Add Gas Change</source>
         <translation>Προσθήκη Αλλαγής Αερίου</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>Προσθήκη σελιδοδείκτη</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>Αφαίρεση συμβάντος</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>Απόκρυψη παρόμοιων συμβάντων</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>
+        <translation type="unfinished"/>
     </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>Απόκρυψη όλων των συμβάντων</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>Απόκρυψη όλων των συμβάντων</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>Απόκρυψη όλων των %1 συμβάντων;</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>Διαγραφή του επιλεγμένου συμβάντος;</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>%1 @ %2:%3</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>ΑΕΡΑΣ</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>Αφαίρεση αυτού του σημείου</translation>
     </message>
@@ -2398,22 +2594,22 @@ Please, remove them first.</source>
         <translation>Κλείσιμο</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="34"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation>Μέσος όρος</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="37"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation>Ελάχιστο</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="40"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation>Μέγιστο</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>Μετακινήστε τον χάρτη και με διπλό κλικ ορίστε την τοποθεσία κατάδυσης</translation>
     </message>
@@ -2427,9 +2623,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>Νέος αρχικός αριθμός</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="126"/>
+        <source>New number</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchBar</name>
+    <message>
+        <location filename="../qt-ui/searchbar.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ShiftImageTimesDialog</name>
@@ -2441,45 +2651,50 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/shiftimagetimes.ui" line="34"/>
         <source>Shift times of image(s) by</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="95"/>
+        <source>h:mm</source>
+        <translation>h:mm</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="102"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="105"/>
         <source>earlier</source>
         <translation>νωρίτερα</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="109"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="112"/>
         <source>later</source>
         <translation>αργότερα</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>Αρχεία εικόνων (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2499,18 +2714,18 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="72"/>
         <source>Shifted time:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="79"/>
         <source>Current time:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="86"/>
         <location filename="../qt-ui/shifttimes.ui" line="93"/>
         <source>0:0</source>
-        <translation type="unfinished">0:0</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="126"/>
@@ -2553,48 +2768,48 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/about.cpp" line="13"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014&lt;/span&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/>
         <source>Connecting...</source>
         <translation>Σύνδεση...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="421"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="419"/>
         <source>Download finished</source>
         <translation>Η λήψη τελείωσε</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>Σφάλμα λήψης: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/>
         <source>Connection Error: </source>
         <translation>Σφάλμα Επικοινωνίας:</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>Άκυρος έλεγχος χρήστη!</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>Cannot parse response!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/>
         <source>Download Success!</source>
         <translation>Επιτυχής Λήψη!</translation>
     </message>
@@ -2610,17 +2825,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>Περιγραφή</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2628,7 +2843,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>Πληροφορίες</translation>
     </message>
@@ -2636,68 +2851,206 @@ 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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="37"/>
-        <source>&lt;h3&gt;Subsurface was unable to check for updates.&lt;/h3&gt;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="36"/>
+        <source>Subsurface was unable to check for updates.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
-        <source>&lt;br/&gt;&lt;b&gt;The following error occurred:&lt;/b&gt;&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="41"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="43"/>
-        <source>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Please check your internet connection.&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>Εγχειρίδιο Χρήσης</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>Δεν βρέθηκε το εγχειρίδιο χρήσης</translation>
     </message>
 </context>
 <context>
+    <name>UserSurvey</name>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="47"/>
+        <source>Subsurface User Survey</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="79"/>
+        <source>Recreational DIver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="92"/>
+        <source>Tech Diver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="105"/>
+        <source>Interested in dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="118"/>
+        <source>I am downloading dives from supported dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="131"/>
+        <source>I am importing dives from other software / sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="144"/>
+        <source>I am manually entering dives</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="190"/>
+        <source>Please type suggestions (in English) in the following box</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="27"/>
+        <source>
+Operating System: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="30"/>
+        <source>
+CPU Architecture: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="35"/>
+        <source>
+OS CPU Architecture %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="39"/>
+        <source>
+Language: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="73"/>
+        <source>Should we ask you later?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="74"/>
+        <source>Don&apos;t ask me again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="75"/>
+        <source>Ask Later</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="76"/>
+        <source>Ask again?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <source>Submit User Survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <source>Subsurface was unable to submit the user survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="101"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="102"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="111"/>
+        <source>Survey successfully submitted.</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </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>Περιγραφή</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="723"/>
+        <location filename="../qt-ui/models.cpp" line="721"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2732,7 +3085,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/webservices.ui" line="85"/>
         <source>Save User ID locally?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="92"/>
@@ -2745,12 +3098,12 @@ Please, remove them first.</source>
         <translation>Μεταφόρτωση</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>Operation timed out</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="279"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="277"/>
         <source>Transfering data...</source>
         <translation>Μεταφορά δεδομένων...</translation>
     </message>
@@ -2758,37 +3111,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>Τύπος</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="368"/>
+        <location filename="../qt-ui/models.cpp" line="373"/>
         <source>Weight</source>
         <translation>Βάρος</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>Πατήστε εδώ για διαγραφή αυτού του συστήματος βαρών</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="453"/>
+        <location filename="../qt-ui/models.cpp" line="458"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="454"/>
+        <location filename="../qt-ui/models.cpp" line="459"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="478"/>
+        <location filename="../qt-ui/models.cpp" line="483"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="484"/>
         <source>m</source>
         <translation>m</translation>
     </message>
@@ -2796,79 +3149,79 @@ 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>Έτος
 &gt; Μήνας / Ταξίδι</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1643"/>
         <source>Duration 
  Total</source>
         <translation>Συνολική
 Διάρκεια</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>
 Average</source>
         <translation>
 Μέσος Όρος</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>
 Shortest</source>
         <translation>
 Συντομότερο</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>
 Longest</source>
         <translation>
 Μακρύτερο</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>Μέσο
 Βάθος (%1)</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>
 Ελάχιστο</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>
 Μέγιστο</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>Μέσο
 SAC (%1)</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>Μέση
@@ -2878,99 +3231,92 @@ SAC (%1)</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="58"/>
+        <location filename="../dive.c" line="87"/>
         <source>pascal</source>
         <translation>pascal</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>bar</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>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="104"/>
-        <location filename="../qt-gui.cpp" line="292"/>
-        <source>l</source>
-        <translation>l</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>cuft</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>m</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>ft</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>lbs</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>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1120"/>
+        <location filename="../dive.c" line="1237"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) ή (%s)</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>αέρας</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="170"/>
+        <location filename="../equipment.c" line="210"/>
         <source>integrated</source>
         <translation>ενσωματωμένα</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="171"/>
+        <location filename="../equipment.c" line="211"/>
         <source>belt</source>
         <translation>ζώνη</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="172"/>
+        <location filename="../equipment.c" line="212"/>
         <source>ankle</source>
         <translation>αστραγάλου</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="173"/>
+        <location filename="../equipment.c" line="213"/>
         <source>backplate weight</source>
         <translation>βάρος backplate</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="174"/>
+        <location filename="../equipment.c" line="214"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -2987,822 +3333,865 @@ SAC (%1)</translation>
         <translation>Μέγιστο αριθμός υποστηριζόμενων στηλών στην εισαγωγή CSV είναι %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>none</source>
         <translation>κανένα</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>deco stop</source>
         <translation>στάση αποσυμπίεσης</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ascent</source>
         <translation>άνοδος</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ceiling</source>
         <translation>ταβάνι</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>workload</source>
         <translation>φόρτο εργασίας</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>transmitter</source>
         <translation>πομπός</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>violation</source>
         <translation>παράβαση</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>bookmark</source>
         <translation>σελιδοδείκτης</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>surface</source>
         <translation>επιφάνεια</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>safety stop</source>
         <translation>στάση ασφαλείας</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>αλλαγή αερίου</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (voluntary)</source>
         <translation>στάση ασφαλείας (προληπτική)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (mandatory)</source>
         <translation>στάση ασφαλείας (υποχρεωτική)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>deepstop</source>
         <translation>βαθιά στάση</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>ceiling (safety stop)</source>
         <translation>ταβάνι (στάση ασφαλείας)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>divetime</source>
         <translation>διάρκεια</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>below floor</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>maxdepth</source>
         <translation>μέγιστο βάθος</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>airtime</source>
         <translation>airtime</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>heading</source>
         <translation>heading</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>tissue level warning</source>
         <translation>προειδοποίηση επιπέδου ιστών</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>non stop time</source>
         <translation>non stop time</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="163"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>invalid event number</source>
         <translation>άκυρος αριθμός συμβάντος</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>Αδύνατον να αναλυθεί το %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="411"/>
+        <location filename="../libdivecomputer.c" line="414"/>
         <source>Error registering the data</source>
         <translation>Σφάλμα στην καταχώρηση των δεδομένων</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="419"/>
+        <location filename="../libdivecomputer.c" line="422"/>
         <source>Error parsing the datetime</source>
         <translation>Σφάλμα στην ημερομηνία</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="438"/>
         <source>Dive %d: %s %d %04d</source>
         <translation>Κατάδυση %d: %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="440"/>
+        <location filename="../libdivecomputer.c" line="443"/>
         <source>Error parsing the divetime</source>
         <translation>Σφάλμα στην διάρκεια της κατάδυσης</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="449"/>
+        <location filename="../libdivecomputer.c" line="452"/>
         <source>Error parsing the maxdepth</source>
         <translation>Σφάλμα στο μέγιστο βάθος</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="458"/>
+        <location filename="../libdivecomputer.c" line="461"/>
         <source>Error parsing the gas mix count</source>
         <translation>Σφάλμα στον αριθμό των αερίων</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="470"/>
+        <location filename="../libdivecomputer.c" line="473"/>
         <source>Error obtaining water salinity</source>
         <translation>Σφάλμα στην απόκτηση της αλμυρότητας</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error obtaining surface pressure</source>
         <translation>Σφάλμα στην απόκτηση της ατμοσφαιρικής πίεσης</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the gas mix</source>
         <translation>Σφάλμα στο μίγμα αερίων</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="493"/>
+        <location filename="../libdivecomputer.c" line="496"/>
         <source>Error parsing the samples</source>
         <translation>Σφάλμα στα δείγματα</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="623"/>
+        <location filename="../libdivecomputer.c" line="626"/>
         <source>Event: waiting for user action</source>
         <translation>Συμβάν: Περιμένοντας για ενέργεια από τον χρήστη</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>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="691"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the event handler.</source>
         <translation>Σφάλμα στην καταχώρηση του συμβάντος</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="696"/>
+        <location filename="../libdivecomputer.c" line="699"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Σφάλμα στην καταχώρηση της ακύρωσης</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="717"/>
+        <location filename="../libdivecomputer.c" line="720"/>
         <source>Dive data import error</source>
         <translation>Σφάλμα στην εισαγωγή δεδομένων</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="756"/>
+        <location filename="../libdivecomputer.c" line="759"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Unable to create libdivecomputer context</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="763"/>
+        <location filename="../libdivecomputer.c" line="766"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Αδύνατον να ανοιχθεί το %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="462"/>
+        <location filename="../parse-xml.c" line="466"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Περίεργο νούμερο ποσοστού %s
 </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>Σφάλμα στην ανάλυση του &apos;%s&apos;</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>Σφάλμα στο ερώτημα get_events της βάσης δεδομένων
 </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>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../file.c" line="166"/>
-        <source>Database connection failed &apos;%s&apos;.
+        <source>Database connection failed '%s'.
 </source>
         <translation>Σφάλμα στην επικοινωνία με την βάση δεδομένων &apos;%s&apos;
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1887"/>
-        <location filename="../parse-xml.c" line="2034"/>
-        <source>Database query failed &apos;%s&apos;.
+        <location filename="../parse-xml.c" line="1945"/>
+        <location filename="../parse-xml.c" line="2092"/>
+        <source>Database query failed '%s'.
 </source>
         <translation>Σφάλμα στο ερώτημα της βάσης δεδομένων &apos;%s&apos;
 </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>Αδύνατο το άνοιγμα του stylesheet %s</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>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="146"/>
-        <location filename="../planner.c" line="617"/>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation>Το αέριο %d/%d δεν υπάρχει</translation>
+        <location filename="../planner.c" line="159"/>
+        <location filename="../planner.c" line="752"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="308"/>
+        <location filename="../planner.c" line="345"/>
         <source>Too many gas mixes</source>
         <translation>Πάρα πολλά μείγματα αερίων</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="489"/>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-</translation>
+        <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"/>
     </message>
     <message>
-        <location filename="../planner.c" line="530"/>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</translation>
+        <location filename="../planner.c" line="535"/>
+        <source>based on GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="539"/>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</translation>
+        <location filename="../planner.c" line="538"/>
+        <source>Subsurface dive plan</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="550"/>
-        <source>Switch gas to %s
-</source>
-        <translation>Switch gas to %s
-</translation>
+        <location filename="../planner.c" line="542"/>
+        <source>depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="558"/>
-        <source>Gas consumption:
-</source>
-        <translation>Κατανάλωση αερίου:
-</translation>
+        <location filename="../planner.c" line="545"/>
+        <source>runtime</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="569"/>
-        <source>%.0f%s of %s
-</source>
-        <translation>%.0f%s of %s
-</translation>
+        <location filename="../planner.c" line="548"/>
+        <source>duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="551"/>
+        <source>gas</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="606"/>
+        <source>%3.0f%s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
+        <source>%3dmin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="629"/>
+        <source>Switch gas to %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="638"/>
+        <source>Gas consumption:</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="659"/>
+        <source>this is more gas than available in the specified cylinder!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="664"/>
+        <source>not enough reserve for gas sharing on ascent!</source>
+        <translation type="unfinished"/>
+    </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"/>
     </message>
     <message>
-        <location filename="../planner.c" line="810"/>
+        <location filename="../planner.c" line="668"/>
+        <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="980"/>
         <source>ean</source>
         <translation>ean</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1229"/>
+        <location filename="../profile.c" line="1253"/>
         <source>P: %d%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1233"/>
+        <location filename="../profile.c" line="1257"/>
         <source>T: %.1f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1263"/>
         <source>V: %.1f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1244"/>
+        <location filename="../profile.c" line="1268"/>
         <source>CNS: %u%%
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1246"/>
+        <location filename="../profile.c" line="1270"/>
         <source>pO%s: %.2fbar
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1272"/>
         <source>pN%s: %.2fbar
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="1274"/>
         <source>pHe: %.2fbar
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="1277"/>
         <source>MOD: %d%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1276"/>
+        <location filename="../profile.c" line="1300"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="1308"/>
         <source>Deco: %umin @ %.0f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1291"/>
+        <location filename="../profile.c" line="1315"/>
         <source>In deco
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1293"/>
+        <location filename="../profile.c" line="1317"/>
         <source>NDL: %umin
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1305"/>
+        <location filename="../profile.c" line="1329"/>
         <source>In deco (calc)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1307"/>
+        <location filename="../profile.c" line="1331"/>
         <source>NDL: %umin (calc)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1310"/>
+        <location filename="../profile.c" line="1334"/>
         <source>TTS: %umin (calc)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1313"/>
+        <location filename="../profile.c" line="1337"/>
         <source>Calculated ceiling %.0f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1319"/>
+        <location filename="../profile.c" line="1343"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1325"/>
+        <location filename="../profile.c" line="1349"/>
         <source>heartbeat: %d
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1327"/>
+        <location filename="../profile.c" line="1351"/>
         <source>bearing: %d
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1419"/>
+        <location filename="../profile.c" line="1443"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</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>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1435"/>
+        <location filename="../profile.c" line="1459"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1439"/>
+        <location filename="../profile.c" line="1463"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</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>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1454"/>
+        <location filename="../profile.c" line="1478"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="273"/>
+        <location filename="../qt-gui.cpp" line="281"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="276"/>
+        <location filename="../qt-gui.cpp" line="284"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="392"/>
-        <source>%1, %2 %3, %4 %5:%6</source>
-        <translation>%1, %2 %3, %4 %5:%6</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="405"/>
-        <source>%1 %2, %3
-%4:%5</source>
-        <translation>%1 %2, %3
-%4:%5</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="418"/>
+        <location filename="../qt-gui.cpp" line="417"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 dives)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="423"/>
+        <location filename="../qt-gui.cpp" line="422"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 dive)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>boat</source>
         <translation>σκάφος</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>shore</source>
         <translation>ακτή</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>drift</source>
         <translation>ρεύμα</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>deep</source>
         <translation>βαθιά</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>cavern</source>
         <translation>ανοικτό σπήλαιο</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>ice</source>
         <translation>πάγος</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>wreck</source>
         <translation>ναυάγιο</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>cave</source>
         <translation>σπήλαιο</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>altitude</source>
         <translation>υψόμετρο</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>pool</source>
         <translation>πισίνα</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>lake</source>
         <translation>λίμνη</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>river</source>
         <translation>ποτάμι</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>night</source>
         <translation>νύχτα</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>fresh</source>
         <translation>fresh</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>student</source>
         <translation>μαθητής</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>photo</source>
         <translation>φωτογραφία</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>video</source>
         <translation>βίντεο</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>instructor</source>
         <translation>εκπαιδευτής</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="25"/>
         <source>deco</source>
         <translation>αποσυμπίεση</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="216"/>
+        <location filename="../dive.c" line="133"/>
+        <source>ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="214"/>
         <source>more than %d days</source>
         <translation>περισσότερο από %d ημέρες</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="220"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="224"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="235"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation>για καταδύσεις #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="242"/>
+        <location filename="../statistics.c" line="240"/>
         <source>for selected dives</source>
         <translation>για επιλεγμένες καταδύσεις</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="275"/>
         <source>for dive #%d</source>
         <translation>για κατάδυση #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for selected dive</source>
         <translation>για επιλεγμένη κατάδυση</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for all dives</source>
         <translation>για όλες τις καταδύσεις</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="283"/>
+        <location filename="../statistics.c" line="281"/>
         <source>(no dives)</source>
         <translation>(καμία κατάδυση)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sun</source>
         <translation>Κυρ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Mon</source>
         <translation>Δευ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Tue</source>
         <translation>Τρι</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Wed</source>
         <translation>Τετ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Thu</source>
         <translation>Πεμ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Fri</source>
         <translation>Παρ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sat</source>
         <translation>Σαβ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jan</source>
         <translation>Ιαν</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Feb</source>
         <translation>Φεβ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Mar</source>
         <translation>Μαρ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Apr</source>
         <translation>Απρ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>May</source>
         <translation>Μαι</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jun</source>
         <translation>Ιουν</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Jul</source>
         <translation>Ιουλ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Aug</source>
         <translation>Αυγ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Sep</source>
         <translation>Σεπ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Oct</source>
         <translation>Οκτ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Nov</source>
         <translation>Νοε</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Dec</source>
         <translation>Δεκ</translation>
     </message>
@@ -3832,97 +4221,97 @@ Is the Uemis Zurich plugged in correctly?</source>
 Είναι το Uemis Zurich σωστά συνδεδεμένο;</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="107"/>
+        <location filename="../uemis-downloader.c" line="111"/>
         <source>unknown</source>
         <translation>άγνωστο</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="379"/>
+        <location filename="../uemis-downloader.c" line="383"/>
         <source>Reading %s %s</source>
         <translation>Reading %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="399"/>
+        <location filename="../uemis-downloader.c" line="403"/>
         <source>data</source>
         <translation>δεδομένα</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="420"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>divelog entry id</source>
         <translation>divelog entry id</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="422"/>
+        <location filename="../uemis-downloader.c" line="426"/>
         <source>divespot data id</source>
         <translation>divespot data id</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
+        <location filename="../uemis-downloader.c" line="428"/>
         <source>more data dive id</source>
         <translation>more data dive id</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>wetsuit</source>
         <translation>υγρού τύπου</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>semidry</source>
         <translation>ημιστεγανή</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>drysuit</source>
         <translation>στεγανή</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>shorty</source>
         <translation>μονοσόρτς</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>vest</source>
         <translation>γιλέκο</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>long john</source>
         <translation>long john</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>jacket</source>
         <translation>jacket</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>full suit</source>
         <translation>μονοκόματη</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>2 pcs full suit</source>
         <translation>2 κομματιών</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="620"/>
+        <location filename="../uemis-downloader.c" line="624"/>
         <source>membrane</source>
         <translation>μεμβράνης</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="802"/>
+        <location filename="../uemis-downloader.c" line="823"/>
         <source>Init Communication</source>
         <translation>Init Communication</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="804"/>
+        <location filename="../uemis-downloader.c" line="825"/>
         <source>Uemis init failed</source>
         <translation>Uemis init failed</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="815"/>
+        <location filename="../uemis-downloader.c" line="836"/>
         <source>Start download</source>
         <translation>Έναρξη λήψης</translation>
     </message>
@@ -3943,18 +4332,18 @@ Is the Uemis Zurich plugged in correctly?</source>
     </message>
     <message>
         <location filename="../uemis.c" line="203"/>
-        <source>PO2 Green Warning</source>
-        <translation>Προειδοποίηση πράσινου PO2</translation>
+        <source>pO₂ Green Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
-        <source>PO2 Ascend Warning</source>
-        <translation>Προειδοποίηση PO2 ανόδου</translation>
+        <source>pO₂ Ascend Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="208"/>
-        <source>PO2 Ascend Alarm</source>
-        <translation>Συναγερμός PO2 ανόδου</translation>
+        <source>pO₂ Ascend Alarm</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
@@ -4016,5 +4405,214 @@ Is the Uemis Zurich plugged in correctly?</source>
         <source>Low Battery Alert</source>
         <translation>Συναγερμός Χαμηλής Μπαταρίας</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"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="36"/>
+        <source>Date:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="38"/>
+        <source>Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="40"/>
+        <source>Duration:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="41"/>
+        <source>min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="43"/>
+        <source>Max Depth:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="46"/>
+        <source>Air Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="48"/>
+        <source>Water Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="50"/>
+        <source>Location:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="54"/>
+        <source>Notes:</source>
+        <translation>Σημειώσεις:</translation>
+    </message>
+</context>
+<context>
+    <name>plannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="35"/>
+        <source>Rates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="56"/>
+        <source>Ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="77"/>
+        <source>below 75% avg. depth</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="94"/>
+        <source>75%-50% avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="111"/>
+        <source>50% avg. depth - 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="128"/>
+        <source>6m/20ft to surface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="148"/>
+        <source>Descent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="200"/>
+        <source>surface to the bottom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="226"/>
+        <source>Planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="247"/>
+        <source>GF low</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="264"/>
+        <source>GF high</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
+        <source>Drop to first depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
+        <source>Last Stop at 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>plan backgas breaks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="318"/>
+        <source>Gas Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <source>bottom SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="349"/>
+        <source>deco SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="359"/>
+        <source>bottom pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="389"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="382"/>
+        <source>deco pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="421"/>
+        <source>Dive Notes</source>
+        <translation>Σημειώσεις</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="445"/>
+        <source>display runtime</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="458"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="461"/>
+        <source>display segment duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="471"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="474"/>
+        <source>display transitions in deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="481"/>
+        <source>verbatim diveplan</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/subsurface_en_GB.ts b/translations/subsurface_en_GB.ts
index 618794d16..a7b67d11a 100644
--- a/translations/subsurface_en_GB.ts
+++ b/translations/subsurface_en_GB.ts
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="en_GB" version="2.0">
+<defaultcodec>UTF-8</defaultcodec>
 <context>
     <name>CylindersModel</name>
     <message>
@@ -37,42 +38,42 @@
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="71"/>
+        <location filename="../qt-ui/models.cpp" line="70"/>
         <source>Switch at</source>
         <translation>Switch at</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>Clicking here will remove this cylinder.</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>Cylinder cannot be removed</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>This gas in use. Only cylinders that are not used in the dive can be removed.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="507"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="508"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="527"/>
+        <location filename="../qt-ui/models.cpp" line="532"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="528"/>
+        <location filename="../qt-ui/models.cpp" line="533"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -100,22 +101,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>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Device ID</source>
         <translation>Device ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Nickname</source>
         <translation>Nickname</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>Clicking here will remove this divecomputer.</translation>
     </message>
@@ -123,190 +124,326 @@
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="90"/>
-        <source>air</source>
-        <translation>air</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="92"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</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>Bailing out to OC</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> begin</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> end</translation>
     </message>
 </context>
 <context>
-    <name>DiveGasPressureItem</name>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="475"/>
-        <source>air</source>
-        <translation>air</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="476"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-</context>
-<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1258"/>
-        <source> l/min</source>
-        <translation> l/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
-        <source> cuft/min</source>
-        <translation> cuft/min</translation>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <source>/min</source>
+        <translation>/min</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>Show Search Box</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="706"/>
         <source>expand all</source>
         <translation>expand all</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="740"/>
+        <location filename="../qt-ui/divelistview.cpp" line="707"/>
         <source>collapse all</source>
         <translation>collapse all</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="741"/>
+        <location filename="../qt-ui/divelistview.cpp" line="708"/>
         <source>collapse others</source>
         <translation>collapse others</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>remove dive(s) from trip</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>create new trip above</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>add dive(s) to trip immediately above</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>add dive(s) to trip immediately below</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>merge trip with trip above</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>merge trip with trip below</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>delete dive(s)</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>mark dive(s) invalid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
-        <source>save As</source>
-        <translation>save As</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="763"/>
-        <source>export As UDDF</source>
-        <translation>export As UDDF</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="764"/>
-        <source>export As CSV</source>
-        <translation>Export as CSV</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="744"/>
+        <source>renumber dive(s)</source>
+        <translation>renumber dive(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="765"/>
+        <location filename="../qt-ui/divelistview.cpp" line="745"/>
         <source>shift times</source>
         <translation>shift times</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="766"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>load images</source>
         <translation>load images</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="769"/>
-        <source>upload dive(s) to divelogs.de</source>
-        <translation>upload dive(s) to divelogs.de</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Open Image Files</source>
+        <translation>Open Image Files</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <source>merge selected dives</source>
+        <translation>merge selected dives</translation>
+    </message>
+</context>
+<context>
+    <name>DiveLogExportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
+        <source>Export Dive Log Files</source>
+        <translation>Export Dive Log Files</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="24"/>
+        <source>General Export</source>
+        <translation>General Export</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="30"/>
+        <source>Export format</source>
+        <translation>Export format</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="42"/>
+        <source>Subsurface XML</source>
+        <translation>Subsurface XML</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="61"/>
+        <source>UDDF</source>
+        <translation>UDDF</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="74"/>
+        <source>divelogs.de</source>
+        <translation>divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="795"/>
-        <source>Save Dives As...</source>
-        <translation>Save Dives As...</translation>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="84"/>
+        <source>CSV</source>
+        <translation>CSV</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="94"/>
+        <source>Worldmap</source>
+        <translation>Worldmap</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="107"/>
+        <source>Selection</source>
+        <translation>Selection</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="116"/>
+        <source>Selected dives</source>
+        <translation>Selected dives</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="126"/>
+        <source>All dives</source>
+        <translation>All dives</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="178"/>
+        <source>HTML</source>
+        <translation>HTML</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="184"/>
+        <source>General Settings</source>
+        <translation>General Settings</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="190"/>
+        <source>Subsurface Numbers</source>
+        <translation>Subsurface Numbers</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="203"/>
+        <source>Selected Dives</source>
+        <translation>Selected Dives</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="216"/>
+        <source>Minimum Javascript</source>
+        <translation>Minimum Javascript</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="229"/>
+        <source>All Dives</source>
+        <translation>All Dives</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="239"/>
+        <source>Export List only</source>
+        <translation>Export list only</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="252"/>
+        <source>Style Options</source>
+        <translation>Style Options</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="264"/>
+        <source>Font</source>
+        <translation>Font</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="274"/>
+        <source>Font size</source>
+        <translation>Font size</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="814"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
+        <source>8</source>
+        <translation>8</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <source>10</source>
+        <translation>10</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <source>12</source>
+        <translation>12</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <source>14</source>
+        <translation>14</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <source>16</source>
+        <translation>16</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <source>18</source>
+        <translation>18</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <source>20</source>
+        <translation>20</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="323"/>
+        <source>Theme</source>
+        <translation>Theme</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
+        <source>Light</source>
+        <translation>Light</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <source>Sand</source>
+        <translation>Sand</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="153"/>
         <source>Export UDDF File as</source>
         <translation>Export UDDF File as</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>UDDF files (*.uddf *.UDDF)</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>Export CSV File as</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>CSV files (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Open Image Files</source>
-        <translation>Open Image Files</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="162"/>
+        <source>Export World Map</source>
+        <translation>Export World Map</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
-        <translation>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="163"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="177"/>
+        <source>HTML files (*.html)</source>
+        <translation>HTML files (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="760"/>
-        <source>merge selected dives</source>
-        <translation>merge selected dives</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="167"/>
+        <source>Export Subsurface XML</source>
+        <translation>Export Subsurface XML</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="168"/>
+        <source>XML files (*.xml *.ssrf)</source>
+        <translation>XML files (*.xml *.ssrf)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="176"/>
+        <source>Export HTML files as</source>
+        <translation>Export HTML files as</translation>
     </message>
 </context>
 <context>
@@ -317,138 +454,133 @@
         <translation>Import dive log file</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="36"/>
-        <source>Import CSV Dive Log Files</source>
-        <translation>Import CSV Dive Log Files</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="50"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
         <source>CSV options</source>
         <translation>CSV options</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="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>Field Separator</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>Pre-configured imports</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>Field Configuration</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="80"/>
         <source>Depth</source>
         <translation>Depth</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="100"/>
         <source>Stopdepth</source>
         <translation>Stop depth</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="107"/>
         <source>PO2</source>
         <translation>PO2</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>Time</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="121"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="151"/>
         <source>Cns</source>
         <translation>CNS</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>Units</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>Metric</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>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="248"/>
         <source>Manual dives</source>
         <translation>Manual dives</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="283"/>
         <source>Dive #</source>
         <translation>Dive No.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="317"/>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="385"/>
         <source>Duration</source>
         <translation>Duration</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="470"/>
         <source>Tags</source>
         <translation>Tags</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
         <source>Location</source>
         <translation>Location</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="453"/>
         <source>Gps</source>
         <translation>Gps</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="300"/>
         <source>Max depth</source>
         <translation>Max depth</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="334"/>
         <source>Mean depth</source>
         <translation>Mean depth</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="368"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="402"/>
         <source>Notes</source>
         <translation>Notes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="436"/>
         <source>Weight</source>
         <translation>Weight</translation>
     </message>
@@ -456,105 +588,70 @@
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="71"/>
-        <source>Bottom SAC</source>
-        <translation>Bottom SAC</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="106"/>
+        <source>Planned Dive Time</source>
+        <translation>Planned dive time</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="85"/>
-        <source>SAC on DECO Stop</source>
-        <translation>SAC on DECO Stop</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="134"/>
+        <source>Altitude</source>
+        <translation>Altitude</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="78"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="98"/>
-        <source>GFLow</source>
-        <translation>GFLow</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="125"/>
-        <source>Last Stop at 6m</source>
-        <translation>Last Stop at 6m</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="174"/>
-        <source>Start Time</source>
-        <translation>Start Time</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="181"/>
+        <location filename="../qt-ui/diveplanner.ui" line="141"/>
         <source>ATM Pressure</source>
         <translation>ATM Pressure</translation>
     </message>
-</context>
-<context>
-    <name>DivePlannerGraphics</name>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="114"/>
-        <source>10m</source>
-        <translation>10m</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="116"/>
-        <source>30ft</source>
-        <translation>30ft</translation>
-    </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="363"/>
-        <source>Handler Position Error</source>
-        <translation>Handler Position Error</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="148"/>
+        <source>mbar</source>
+        <translation>mbar</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>
-        <translation>One or more of your stops will be lost with this operations, 
-Please, remove them first.</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="158"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="445"/>
-        <source>AIR</source>
-        <translation>AIR</translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="137"/>
+        <source>unknown</source>
+        <translation>unknown</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1148"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="586"/>
         <source>Final Depth</source>
         <translation>Final Depth</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1150"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="588"/>
         <source>Run time</source>
         <translation>Run time</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1152"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="590"/>
         <source>Duration</source>
         <translation>Duration</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1154"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="592"/>
         <source>Used Gas</source>
         <translation>Used Gas</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>CC Set Point</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>Discard the Plan?</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>You are about to discard your plan.</translation>
     </message>
@@ -562,17 +659,17 @@ Please, remove them first.</translation>
 <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>Dive Planner Points</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="256"/>
         <source>Available Gases</source>
         <translation>Available Gases</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>add dive data point</translation>
     </message>
@@ -616,8 +713,23 @@ Please, remove them first.</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
-        <source>Pressure  S</source>
-        <translation>Pressure  S</translation>
+        <source>Pressure S</source>
+        <translation>Pressure S</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <source>pN₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>pHe</source>
+        <translation>pHe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>pO₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
@@ -634,86 +746,71 @@ Please, remove them first.</translation>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
-        <source>PN2</source>
-        <translation>PN2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
-        <source>PHE</source>
-        <translation>PHE</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
-        <source>PO2</source>
-        <translation>PO2</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>No.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>date</source>
         <translation>date</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1298"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
+        <location filename="../qt-ui/models.cpp" line="1307"/>
         <source>suit</source>
         <translation>suit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1310"/>
         <source>cyl</source>
         <translation>cyl</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1344"/>
+        <location filename="../qt-ui/models.cpp" line="1325"/>
         <source>location</source>
         <translation>location</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1316"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1338"/>
+        <location filename="../qt-ui/models.cpp" line="1319"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1341"/>
+        <location filename="../qt-ui/models.cpp" line="1322"/>
         <source>maxCNS</source>
         <translation>maxCNS</translation>
     </message>
@@ -721,115 +818,115 @@ Please, remove them first.</translation>
 <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>Invalid response from server</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>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</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>Expected XML tag &apos;DiveDates&apos; not found</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>Malformed XML response. Line %1: %2</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>no dives were selected</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>failed to create zip file for upload: %s</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>cannot create temporary file: %s</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>internal error: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="181"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="179"/>
         <source>internal error</source>
         <translation>internal error</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>Done</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>Uploading dive list...</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>Downloading dive list...</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>Downloading %1 dives...</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>Download finished - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
         <source>Corrupted download</source>
         <translation>Corrupted download</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>The archive could not be opened:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Upload failed</source>
         <translation>Upload failed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="849"/>
         <source>Upload successful</source>
         <translation>Upload successful</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="854"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="852"/>
         <source>Login failed</source>
         <translation>Login failed</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>Cannot parse response</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="868"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Error: %1</source>
         <translation>Error: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="835"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/>
         <source>Upload finished</source>
         <translation>Upload finished</translation>
     </message>
@@ -837,54 +934,54 @@ Please, remove them first.</translation>
 <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>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="165"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/>
         <source>Error</source>
         <translation>Error</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>Retry</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>Find Uemis dive computer</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>Choose file for divecomputer download logfile</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>Log files (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="339"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
         <source>Warning</source>
         <translation>Warning</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>Saving the libdivecomputer dump will NOT download dives to the dive list.</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>Choose file for divecomputer binary dump file</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>Dump files (*.bin)</translation>
     </message>
@@ -952,7 +1049,7 @@ Please, remove them first.</translation>
 <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>Edit Selected Dive Locations</translation>
     </message>
@@ -961,848 +1058,858 @@ Please, remove them first.</translation>
     <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>Dive Notes</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>Location</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="148"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Coordinates</source>
         <translation>Coordinates</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="169"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="155"/>
+        <location filename="../qt-ui/maintab.ui" line="148"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="63"/>
-        <source>Start time</source>
-        <translation>Start time</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>Air temp</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>Water temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="127"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Tags</source>
         <translation>Tags</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="223"/>
         <source>Rating</source>
         <translation>Rating</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="236"/>
         <source>Visibility</source>
         <translation>Visibility</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="215"/>
+        <location filename="../qt-ui/maintab.ui" line="127"/>
         <source>Suit</source>
         <translation>Suit</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>Notes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="270"/>
+        <location filename="../qt-ui/maintab.ui" line="311"/>
         <source>Equipment</source>
         <translation>Equipment</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="350"/>
+        <location filename="../qt-ui/maintab.ui" line="391"/>
         <source>Dive Info</source>
         <translation>Dive Info</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>Date</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="414"/>
+        <location filename="../qt-ui/maintab.ui" line="275"/>
+        <source>Time</source>
+        <translation>Time</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="455"/>
         <source>Interval</source>
         <translation>Interval</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="433"/>
+        <location filename="../qt-ui/maintab.ui" line="474"/>
         <source>Gases Used</source>
         <translation>Gases Used</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="452"/>
+        <location filename="../qt-ui/maintab.ui" line="493"/>
         <source>Gas Consumed</source>
         <translation>Gas Consumed</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>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="531"/>
         <source>Max. Depth</source>
         <translation>Max. Depth</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="509"/>
+        <location filename="../qt-ui/maintab.ui" line="550"/>
         <source>Ave. Depth</source>
         <translation>Ave. Depth</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="528"/>
+        <location filename="../qt-ui/maintab.ui" line="569"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="547"/>
+        <location filename="../qt-ui/maintab.ui" line="588"/>
         <source>Air Pressure</source>
         <translation>Air Pressure</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="566"/>
+        <location filename="../qt-ui/maintab.ui" line="607"/>
         <source>Air Temperature</source>
         <translation>Air Temperature</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="585"/>
+        <location filename="../qt-ui/maintab.ui" line="626"/>
         <source>Water Temperature</source>
         <translation>Water Temperature</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="604"/>
+        <location filename="../qt-ui/maintab.ui" line="645"/>
         <source>Dive Time</source>
         <translation>Dive Time</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="623"/>
+        <location filename="../qt-ui/maintab.ui" line="664"/>
         <source>Salinity</source>
         <translation>Salinity</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="660"/>
+        <location filename="../qt-ui/maintab.ui" line="701"/>
         <source>Stats</source>
         <translation>Stats</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="746"/>
         <source>Depth</source>
         <translation>Depth</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Temperature</source>
         <translation>Temperature</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="784"/>
         <source>Duration</source>
         <translation>Duration</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Total Time</source>
         <translation>Total Time</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="835"/>
         <source>Dives</source>
         <translation>Dives</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
+        <source>Gas Consumption</source>
+        <translation>Gas Consumption</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="919"/>
+        <source>Photos</source>
+        <translation>Photos</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="89"/>
         <source>Cylinders</source>
         <translation>Cylinders</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="90"/>
         <source>Add Cylinder</source>
         <translation>Add Cylinder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="93"/>
         <source>Weights</source>
         <translation>Weights</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>Add Weight System</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="438"/>
+        <location filename="../qt-ui/maintab.cpp" line="409"/>
         <source>Trip Location</source>
         <translation>Trip Location</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>Trip Notes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="42"/>
+        <location filename="../qt-ui/maintab.cpp" line="48"/>
         <source>Save</source>
         <translation>Save</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="46"/>
+        <location filename="../qt-ui/maintab.cpp" line="52"/>
         <source>Cancel</source>
         <translation>Cancel</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>Air temp [%1]</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>Water temp [%1]</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>This trip is being edited.</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>Multiple dives are being edited.</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>This dive is being edited.</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>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="494"/>
+        <location filename="../qt-ui/maintab.cpp" line="464"/>
         <source>unknown</source>
         <translation>unknown</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>N</source>
-        <translation>N</translation>
+        <location filename="../qt-ui/maintab.cpp" line="501"/>
+        <source>Deepest Dive</source>
+        <translation>Deepest Dive</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>S</source>
-        <translation>S</translation>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <source>Shallowest Dive</source>
+        <translation>Shallowest Dive</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>E</source>
-        <translation>E</translation>
+        <location filename="../qt-ui/maintab.cpp" line="794"/>
+        <source>Discard the Changes?</source>
+        <translation>Discard changes?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>W</source>
-        <translation>W</translation>
+        <location filename="../qt-ui/maintab.cpp" line="795"/>
+        <source>You are about to discard your changes.</source>
+        <translation>You are about to discard your changes.</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>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="571"/>
+        <location filename="../qt-ui/mainwindow.ui" line="646"/>
         <source>&amp;File</source>
         <translation>&amp;File</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>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="583"/>
+        <source>Print</source>
+        <translation>Print</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:'Courier'; 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>&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;</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="606"/>
+        <location filename="../qt-ui/mainwindow.ui" line="679"/>
         <source>&amp;View</source>
         <translation>&amp;View</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="628"/>
+        <location filename="../qt-ui/mainwindow.ui" line="701"/>
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="636"/>
+        <location filename="../qt-ui/mainwindow.ui" line="709"/>
         <source>&amp;Import</source>
         <translation>&amp;Import</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>&amp;New logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="655"/>
+        <location filename="../qt-ui/mainwindow.ui" line="728"/>
         <source>New</source>
         <translation>New</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="658"/>
+        <location filename="../qt-ui/mainwindow.ui" line="731"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</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>&amp;Open logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="666"/>
+        <location filename="../qt-ui/mainwindow.ui" line="739"/>
         <source>Open</source>
         <translation>Open</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <location filename="../qt-ui/mainwindow.ui" line="742"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="674"/>
+        <location filename="../qt-ui/mainwindow.ui" line="747"/>
         <source>&amp;Save</source>
         <translation>&amp;Save</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="677"/>
+        <location filename="../qt-ui/mainwindow.ui" line="750"/>
         <source>Save</source>
         <translation>Save</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="680"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</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>Sa&amp;ve as</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>Save as</source>
         <translation>Save as</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>Ctrl+Shift+S</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>&amp;Close</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Close</source>
         <translation>Close</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="702"/>
+        <location filename="../qt-ui/mainwindow.ui" line="775"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="902"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <source>P&amp;references</source>
+        <translation>P&amp;references</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="831"/>
+        <source>&amp;Add Dive</source>
+        <translation>&amp;Add dive</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <source>Auto &amp;Group</source>
+        <translation>Auto &amp;group</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="863"/>
+        <source>&amp;Dive List</source>
+        <translation>&amp;Dive list</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="871"/>
+        <source>&amp;Profile</source>
+        <translation>&amp;Profile</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="879"/>
+        <source>&amp;Info</source>
+        <translation>&amp;Info</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="887"/>
+        <source>&amp;All</source>
+        <translation>&amp;All</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="895"/>
+        <source>P&amp;rev DC</source>
+        <translation>P&amp;rev DC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="903"/>
+        <source>&amp;Next DC</source>
+        <translation>&amp;Next DC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="911"/>
+        <source>&amp;Select Events</source>
+        <translation>&amp;Select events</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <source>&amp;About Subsurface</source>
+        <translation>&amp;About Subsurface</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="937"/>
+        <source>&amp;Globe</source>
+        <translation>&amp;Globe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="953"/>
+        <source>&amp;Import Log Files</source>
+        <translation>&amp;Import log files</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="959"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="707"/>
-        <source>Export &amp;UDDF</source>
-        <translation>Export &amp;UDDF</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="1008"/>
+        <source>&amp;Export</source>
+        <translation>&amp;Export</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1011"/>
+        <source>Export Dive Logs</source>
+        <translation>Export Dive Logs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1014"/>
+        <source>Ctrl+E</source>
+        <translation>Ctrl+E</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Enable the pN2 Graph</source>
         <translation>Enable the pN2 Graph</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <location filename="../qt-ui/mainwindow.ui" line="128"/>
         <source>Enable the pHe graph</source>
         <translation>Enable the pHe graph</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <location filename="../qt-ui/mainwindow.ui" line="290"/>
         <source>Show/hide heart rate</source>
         <translation>Show/hide heart rate</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <location filename="../qt-ui/mainwindow.ui" line="342"/>
         <source>Enable EAD, END, and EADD</source>
         <translation>Enable EAD, END, and EADD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="238"/>
         <source>Show NDL / TTS</source>
         <translation>Show NDL / TTS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="456"/>
+        <location filename="../qt-ui/mainwindow.ui" line="394"/>
         <source>Rescale depth axis</source>
         <translation>Rescale depth axis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="710"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="715"/>
-        <source>Export HTML World Map</source>
-        <translation>Export HTML World Map</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="718"/>
-        <source>Ctrl+H</source>
-        <translation>Ctrl+H</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="723"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>&amp;Print</source>
         <translation>&amp;Print</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="734"/>
+        <location filename="../qt-ui/mainwindow.ui" line="791"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="742"/>
+        <location filename="../qt-ui/mainwindow.ui" line="799"/>
         <source>&amp;Quit</source>
         <translation>&amp;Quit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="753"/>
+        <location filename="../qt-ui/mainwindow.ui" line="810"/>
         <source>Import from &amp;dive computer</source>
         <translation>Import from &amp;dive computer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="818"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation>Import &amp;GPS data from Subsurface Service</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="764"/>
+        <location filename="../qt-ui/mainwindow.ui" line="821"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="826"/>
         <source>&amp;Edit Device Names</source>
         <translation>&amp;Edit Device Names</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="834"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="782"/>
+        <location filename="../qt-ui/mainwindow.ui" line="839"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Renumber</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="785"/>
+        <location filename="../qt-ui/mainwindow.ui" line="842"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="798"/>
+        <location filename="../qt-ui/mainwindow.ui" line="855"/>
         <source>&amp;Yearly Statistics</source>
         <translation>&amp;Yearly Statistics</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="801"/>
+        <location filename="../qt-ui/mainwindow.ui" line="858"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="806"/>
-        <source>Dive List</source>
-        <translation>Dive List</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="814"/>
-        <source>Profile</source>
-        <translation>Profile</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="822"/>
-        <source>Info</source>
-        <translation>Info</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="830"/>
-        <source>All</source>
-        <translation>All</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="872"/>
+        <location filename="../qt-ui/mainwindow.ui" line="929"/>
         <source>User &amp;Manual</source>
         <translation>User &amp;Manual</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="880"/>
-        <source>Globe</source>
-        <translation>Globe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="888"/>
+        <location filename="../qt-ui/mainwindow.ui" line="945"/>
         <source>P&amp;lan Dive</source>
         <translation>P&amp;lan Dive</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="891"/>
+        <location filename="../qt-ui/mainwindow.ui" line="948"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="907"/>
-        <source>Import from Divelogs.de</source>
-        <translation>Import from Divelogs.de</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1003"/>
         <source>&amp;Check for Updates</source>
         <translation>&amp;Check for updates</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="951"/>
-        <source>Export CSV</source>
-        <translation>Export CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="726"/>
+        <location filename="../qt-ui/mainwindow.ui" line="783"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</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>Enable the pO2 Graph</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>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="316"/>
         <source>Enable MOD</source>
         <translation>Enable MOD</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>Show the DC Reported Ceiling</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>Show the Calculated Ceiling</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>Show Calculated Ceiling with 3m Increments</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>Calculate All Tissues</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>Show SAC Rate</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>Enable / Disable the Ruler</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="731"/>
-        <source>Preferences</source>
-        <translation>Preferences</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="745"/>
+        <location filename="../qt-ui/mainwindow.ui" line="802"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="756"/>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="774"/>
-        <source>Add Dive</source>
-        <translation>Add Dive</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="793"/>
-        <source>Auto Group</source>
-        <translation>Auto Group</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="809"/>
+        <location filename="../qt-ui/mainwindow.ui" line="866"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="817"/>
+        <location filename="../qt-ui/mainwindow.ui" line="874"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <location filename="../qt-ui/mainwindow.ui" line="882"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="833"/>
+        <location filename="../qt-ui/mainwindow.ui" line="890"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="838"/>
-        <source>Prev DC</source>
-        <translation>Prev DC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="841"/>
+        <location filename="../qt-ui/mainwindow.ui" line="898"/>
         <source>Left</source>
         <translation>Left</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="846"/>
-        <source>Next DC</source>
-        <translation>Next DC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="849"/>
+        <location filename="../qt-ui/mainwindow.ui" line="906"/>
         <source>Right</source>
         <translation>Right</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="854"/>
-        <source>Select Events</source>
-        <translation>Select Events</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <location filename="../qt-ui/mainwindow.ui" line="916"/>
         <source>Input Plan</source>
         <translation>Input Plan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="864"/>
-        <source>About Subsurface</source>
-        <translation>About Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="875"/>
+        <location filename="../qt-ui/mainwindow.ui" line="932"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="883"/>
+        <location filename="../qt-ui/mainwindow.ui" line="940"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="896"/>
-        <source>Import Log Files</source>
-        <translation>Import Log Files</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="899"/>
+        <location filename="../qt-ui/mainwindow.ui" line="956"/>
         <source>Import divelog files from other applications</source>
         <translation>Import divelog files from other applications</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="915"/>
+        <location filename="../qt-ui/mainwindow.ui" line="964"/>
+        <source>Import &amp;from Divelogs.de</source>
+        <translation>Import &amp;from Divelogs.de</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="972"/>
         <source>&amp;Full Screen</source>
         <translation>&amp;Full Screen</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>Toggle Full Screen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <location filename="../qt-ui/mainwindow.ui" line="978"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="174"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
         <source>Open File</source>
         <translation>Open File</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>Please save or cancel the current dive edit before closing the file.</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>
-        <translation>Please save or cancel the current dive edit before trying to plan a dive.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="396"/>
+        <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>Please save or cancel the current dive edit before trying to add a dive.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="645"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="419"/>
+        <source>Print runtime table</source>
+        <translation>Print runtime table</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="710"/>
         <source>Do you want to save the changes you made in the file %1?</source>
         <translation>Do you want to save the changes you made in the file %1?</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>Do you want to save the changes you made in the datafile?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="652"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="717"/>
         <source>Save Changes?</source>
         <translation>Save Changes?</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>Changes will be lost if you don&apos;t save them.</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>Save File as</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>Warning</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>Please save or cancel the current dive edit before opening a new file.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="280"/>
-        <source>Export UDDF File as</source>
-        <translation>Export UDDF File as</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="281"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>UDDF files (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="289"/>
-        <source>Export CSV File as</source>
-        <translation>Export CSV File as</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="290"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>CSV files (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="299"/>
-        <source>Export World Map</source>
-        <translation>Export World Map</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="300"/>
-        <source>HTML files (*.html)</source>
-        <translation>HTML files (*.html)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="449"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="514"/>
         <source>Yearly Statistics</source>
         <translation>Yearly Statistics</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="961"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1076"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1199"/>
         <source>Open Dive Log File</source>
         <translation>Open Dive Log File</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <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>Dive Log Files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML Files (*.xml);;UDDF/UDCF Files(*.uddf *.udcf);;JDiveLog Files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1225"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Please, first finish the current edition before trying to do another.</translation>
     </message>
 </context>
 <context>
+    <name>PlannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Last stop at 20ft</source>
+        <translation>Last stop at 20ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="416"/>
+        <source>Last stop at 6m</source>
+        <translation>Last stop at 6m</translation>
+    </message>
+</context>
+<context>
     <name>PreferencesDialog</name>
     <message>
         <location filename="../qt-ui/preferences.ui" line="85"/>
@@ -1825,247 +1932,297 @@ Please, remove them first.</translation>
         <translation>Language</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="141"/>
+        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <source>Network</source>
+        <translation>Network</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="151"/>
         <source>Lists and Tables</source>
         <translation>Lists and Tables</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="167"/>
         <source>Font size</source>
         <translation>Font size</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="170"/>
+        <location filename="../qt-ui/preferences.ui" line="180"/>
         <source>Dives</source>
         <translation>Dives</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>Default Dive file</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="188"/>
+        <location filename="../qt-ui/preferences.ui" line="198"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="197"/>
+        <location filename="../qt-ui/preferences.ui" line="207"/>
         <source>Display Invalid</source>
         <translation>Display Invalid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="214"/>
+        <location filename="../qt-ui/preferences.ui" line="224"/>
         <source>Default Cylinder</source>
         <translation>Default Cylinder</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>Use Default Cylinder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <location filename="../qt-ui/preferences.ui" line="247"/>
         <source>Animations</source>
         <translation>Animations</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <location filename="../qt-ui/preferences.ui" line="253"/>
         <source>Speed</source>
         <translation>Speed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="270"/>
+        <location filename="../qt-ui/preferences.ui" line="280"/>
         <source>Subsurface Webservice</source>
         <translation>Subsurface Webservice</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>Default User ID</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>Save User ID locally?</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>Clear all settings</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="312"/>
+        <source>Reset all settings to their default value</source>
+        <translation>Reset all settings to their default value</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="348"/>
         <source>Metric</source>
         <translation>Metric</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="333"/>
+        <location filename="../qt-ui/preferences.ui" line="358"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="343"/>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
         <source>Personalize</source>
         <translation>Personalize</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="392"/>
         <source>Depth</source>
         <translation>Depth</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="374"/>
+        <location filename="../qt-ui/preferences.ui" line="399"/>
         <source>meter</source>
         <translation>metre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="409"/>
         <source>feet</source>
         <translation>feet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="401"/>
+        <location filename="../qt-ui/preferences.ui" line="426"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="411"/>
+        <location filename="../qt-ui/preferences.ui" line="436"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="428"/>
+        <location filename="../qt-ui/preferences.ui" line="453"/>
         <source>liter</source>
         <translation>litre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="438"/>
+        <location filename="../qt-ui/preferences.ui" line="463"/>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="455"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="465"/>
+        <location filename="../qt-ui/preferences.ui" line="490"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="482"/>
+        <location filename="../qt-ui/preferences.ui" line="507"/>
         <source>kg</source>
         <translation>kg</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>threshold when showing pO₂</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>threshold when showing pN₂</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>threshold when showing pHe</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="636"/>
-        <source>max ppO₂ when showing MOD</source>
-        <translation>max ppO₂ when showing MOD</translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="811"/>
+        <source>Proxy</source>
+        <translation>Proxy</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="817"/>
+        <source>Proxy type</source>
+        <translation>Proxy type</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="830"/>
+        <source>Host</source>
+        <translation>Hostname</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="856"/>
+        <source>Port</source>
+        <translation>Port</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="882"/>
+        <source>Requires authentication</source>
+        <translation>Requires authentication</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
+        <source>Username</source>
+        <translation>Username</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="657"/>
+        <location filename="../qt-ui/preferences.ui" line="925"/>
+        <source>Password</source>
+        <translation>Password</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="682"/>
         <source>draw dive computer reported ceiling red</source>
         <translation>draw dive computer reported ceiling red</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="747"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>System Default</source>
         <translation>System Default</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="767"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="419"/>
         <source>Pressure</source>
         <translation>Pressure</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="421"/>
+        <location filename="../qt-ui/preferences.ui" line="446"/>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="448"/>
+        <location filename="../qt-ui/preferences.ui" line="473"/>
         <source>Temperature</source>
         <translation>Temperature</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="475"/>
+        <location filename="../qt-ui/preferences.ui" line="500"/>
         <source>Weight</source>
         <translation>Weight</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="517"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="507"/>
+        <location filename="../qt-ui/preferences.ui" line="532"/>
         <source>Time units</source>
         <translation>Time units</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>Ascent/Descent speed denominator</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="520"/>
+        <location filename="../qt-ui/preferences.ui" line="545"/>
         <source>Minutes</source>
         <translation>Minutes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="530"/>
+        <location filename="../qt-ui/preferences.ui" line="555"/>
         <source>Seconds</source>
         <translation>Seconds</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="562"/>
+        <location filename="../qt-ui/preferences.ui" line="587"/>
         <source>Show</source>
         <translation>Show</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>max pO₂ when showing MOD</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="693"/>
         <source>Show non-used cylinders in Equipment Tab</source>
         <translation>show unused cylinders in Equipment Tab</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>show average depth</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>GFLow at max depth</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="691"/>
+        <location filename="../qt-ui/preferences.ui" line="716"/>
         <source>Misc</source>
         <translation>Misc</translation>
     </message>
@@ -2075,35 +2232,65 @@ Please, remove them first.</translation>
         <translation>Preferences</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="697"/>
+        <location filename="../qt-ui/preferences.ui" line="722"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="739"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="23"/>
+        <source>No proxy</source>
+        <translation>No proxy</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="24"/>
+        <source>System proxy</source>
+        <translation>System proxy</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="25"/>
+        <source>HTTP proxy</source>
+        <translation>HTTP proxy</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="26"/>
+        <source>SOCKS proxy</source>
+        <translation>SOCKS proxy</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="245"/>
         <source>Restart required</source>
         <translation>Restart required</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>To correctly load a new language you must restart Subsurface.</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>Open Default Log File</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>Subsurface XML files (*.ssrf *.xml *.XML)</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="394"/>
+        <source>Warning</source>
+        <translation>Warning</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>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</translation>
+    </message>
 </context>
 <context>
     <name>PrintDialog</name>
@@ -2244,72 +2431,72 @@ Please, remove them first.</translation>
 <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>unknown</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>Dive No. %1 - %2</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>Max depth: %1 %2</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>Duration: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1918"/>
+        <location filename="../qt-ui/models.cpp" line="1898"/>
         <source>Gas Used:</source>
         <translation>Gas Used:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1920"/>
+        <location filename="../qt-ui/models.cpp" line="1900"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1922"/>
+        <location filename="../qt-ui/models.cpp" line="1902"/>
         <source>Max. CNS:</source>
         <translation>Max. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1924"/>
+        <location filename="../qt-ui/models.cpp" line="1904"/>
         <source>Weights:</source>
         <translation>Weights:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1929"/>
+        <location filename="../qt-ui/models.cpp" line="1909"/>
         <source>Notes:</source>
         <translation>Notes:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1936"/>
+        <location filename="../qt-ui/models.cpp" line="1916"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1938"/>
+        <location filename="../qt-ui/models.cpp" line="1918"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1940"/>
+        <location filename="../qt-ui/models.cpp" line="1920"/>
         <source>Suit:</source>
         <translation>Suit:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1942"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>Viz:</source>
         <translation>Viz:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1944"/>
+        <location filename="../qt-ui/models.cpp" line="1924"/>
         <source>Rating:</source>
         <translation>Rating:</translation>
     </message>
@@ -2317,62 +2504,77 @@ Please, remove them first.</translation>
 <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> (#%1 of %2)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/>
+        <source>Make first divecomputer</source>
+        <translation>Make first dive computer</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="906"/>
+        <source>Delete this divecomputer</source>
+        <translation>Delete this dive computer</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="913"/>
         <source>Add Gas Change</source>
         <translation>Add Gas Change</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>Add Bookmark</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>Remove Event</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>Hide similar events</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>Edit name</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>Unhide all events</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>Hide events</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>Hide all %1 events?</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>Remove the selected event?</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>%1 @ %2:%3</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>Edit name of bookmark</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>Custom name:</translation>
     </message>
@@ -2380,12 +2582,12 @@ Please, remove them first.</translation>
 <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>AIR</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>Remove this Point</translation>
     </message>
@@ -2395,22 +2597,22 @@ Please, remove them first.</translation>
         <translation>Close</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="34"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation>Average</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="37"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="40"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation>Maximum</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>Move the map and double-click to set the dive location</translation>
     </message>
@@ -2424,9 +2626,23 @@ Please, remove them first.</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="128"/>
         <source>New starting number</source>
         <translation>New starting number</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="126"/>
+        <source>New number</source>
+        <translation>New number</translation>
+    </message>
+</context>
+<context>
+    <name>SearchBar</name>
+    <message>
+        <location filename="../qt-ui/searchbar.ui" line="14"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
 </context>
 <context>
     <name>ShiftImageTimesDialog</name>
@@ -2441,42 +2657,47 @@ Please, remove them first.</translation>
         <translation>Shift times of image(s) by</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="102"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="95"/>
+        <source>h:mm</source>
+        <translation>h:mm</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="105"/>
         <source>earlier</source>
         <translation>earlier</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="109"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="112"/>
         <source>later</source>
         <translation>later</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>To compute the offset between the clocks of your dive computer and your camera use your camera to take a picture of your dive computer displaying the current time. Download that image to your computer and press this button.</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>Determine camera time offset</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>Select image of divecomputer showing time</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>Which date and time are displayed on the image?</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>Open Image File</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>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2556,42 +2777,42 @@ Please, remove them first.</translation>
 <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>Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/>
         <source>Connecting...</source>
         <translation>Connecting...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="421"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="419"/>
         <source>Download finished</source>
         <translation>Download finished</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>Download error: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/>
         <source>Connection Error: </source>
         <translation>Connection Error: </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>Invalid user identifier!</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>Cannot parse response!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/>
         <source>Download Success!</source>
         <translation>Download Success!</translation>
     </message>
@@ -2607,17 +2828,17 @@ Please, remove them first.</translation>
 <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>Description</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2625,7 +2846,7 @@ Please, remove them first.</translation>
 <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>Information</translation>
     </message>
@@ -2633,42 +2854,42 @@ Please, remove them first.</translation>
 <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>Check for updates.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="37"/>
-        <source>&lt;h3&gt;Subsurface was unable to check for updates.&lt;/h3&gt;</source>
-        <translation>&lt;h3&gt;Subsurface was unable to check for updates.&lt;/h3&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="36"/>
+        <source>Subsurface was unable to check for updates.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
-        <source>&lt;br/&gt;&lt;b&gt;The following error occurred:&lt;/b&gt;&lt;br/&gt;</source>
-        <translation>&lt;br/&gt;&lt;b&gt;The following error occurred:&lt;/b&gt;&lt;br/&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="41"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="43"/>
-        <source>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Please check your internet connection.&lt;/b&gt;</source>
-        <translation>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Please check your internet connection.&lt;/b&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
     </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>You are using the latest version of subsurface.</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>A new version of subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="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>&lt;b&gt;A new version of subsurface is available.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</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>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -2676,25 +2897,167 @@ Please, remove them first.</translation>
 <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>User Manual</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>Cannot find the Subsurface manual</translation>
     </message>
 </context>
 <context>
+    <name>UserSurvey</name>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>Dialog</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="47"/>
+        <source>Subsurface User Survey</source>
+        <translation>Subsurface User Survey</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>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.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="79"/>
+        <source>Recreational DIver</source>
+        <translation>Recreational Diver</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="92"/>
+        <source>Tech Diver</source>
+        <translation>Tech Diver</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="105"/>
+        <source>Interested in dive planning</source>
+        <translation>Interested in dive planning</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="118"/>
+        <source>I am downloading dives from supported dive computer</source>
+        <translation>I am downloading dives from supported dive computer</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="131"/>
+        <source>I am importing dives from other software / sources</source>
+        <translation>I am importing dives from other software / sources</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="144"/>
+        <source>I am manually entering dives</source>
+        <translation>I am manually entering dives</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="167"/>
+        <source>I use the Android companion app to track dive locations</source>
+        <translation>I use the Android companion app to track dive locations</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="190"/>
+        <source>Please type suggestions (in English) in the following box</source>
+        <translation>Please type suggestions (in English) in the following box</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="203"/>
+        <source>The following information about your system will also be submitted</source>
+        <translation>The following information about your system will also be submitted</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="27"/>
+        <source>
+Operating System: %1</source>
+        <translation>
+Operating System: %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="30"/>
+        <source>
+CPU Architecture: %1</source>
+        <translation>
+CPU Architecture: %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="35"/>
+        <source>
+OS CPU Architecture %1</source>
+        <translation>
+OS CPU Architecture %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="39"/>
+        <source>
+Language: %1</source>
+        <translation>
+Language: %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="73"/>
+        <source>Should we ask you later?</source>
+        <translation>Should we ask you later?</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="74"/>
+        <source>Don&apos;t ask me again</source>
+        <translation>Don&apos;t ask me again</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="75"/>
+        <source>Ask Later</source>
+        <translation>Ask Later</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="76"/>
+        <source>Ask again?</source>
+        <translation>Ask again?</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <source>Submit User Survey.</source>
+        <translation>Submit User Survey.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <source>Subsurface was unable to submit the user survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="101"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="102"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="111"/>
+        <source>Survey successfully submitted.</source>
+        <translation>Survey successfully submitted.</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>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</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>Description</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="723"/>
+        <location filename="../qt-ui/models.cpp" line="721"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2742,12 +3105,12 @@ Please, remove them first.</translation>
         <translation>Upload</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>Operation timed out</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="279"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="277"/>
         <source>Transfering data...</source>
         <translation>Transfering data...</translation>
     </message>
@@ -2755,37 +3118,37 @@ Please, remove them first.</translation>
 <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</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="368"/>
+        <location filename="../qt-ui/models.cpp" line="373"/>
         <source>Weight</source>
         <translation>Weight</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>Clicking here will remove this weight system.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="453"/>
+        <location filename="../qt-ui/models.cpp" line="458"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="454"/>
+        <location filename="../qt-ui/models.cpp" line="459"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="478"/>
+        <location filename="../qt-ui/models.cpp" line="483"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="484"/>
         <source>m</source>
         <translation>m</translation>
     </message>
@@ -2793,79 +3156,79 @@ Please, remove them first.</translation>
 <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>Year 
  &gt; Month / Trip</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>#</source>
         <translation>No.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1643"/>
         <source>Duration 
  Total</source>
         <translation>Duration 
  Total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>
 Average</source>
         <translation>
 Average</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>
 Shortest</source>
         <translation>
 Shortest</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>
 Longest</source>
         <translation>
 Longest</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>Depth (%1)
  Average</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>
 Minimum</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>
 Maximum</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>SAC (%1)
  Average</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>Temp. (%1)
@@ -2875,99 +3238,92 @@ Maximum</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="58"/>
+        <location filename="../dive.c" line="87"/>
         <source>pascal</source>
         <translation>pascal</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>bar</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>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="104"/>
-        <location filename="../qt-gui.cpp" line="292"/>
-        <source>l</source>
-        <translation>l</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>cuft</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>m</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>ft</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>lbs</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>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1120"/>
+        <location filename="../dive.c" line="1237"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) or (%s)</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>air</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="170"/>
+        <location filename="../equipment.c" line="210"/>
         <source>integrated</source>
         <translation>integrated</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="171"/>
+        <location filename="../equipment.c" line="211"/>
         <source>belt</source>
         <translation>belt</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="172"/>
+        <location filename="../equipment.c" line="212"/>
         <source>ankle</source>
         <translation>ankle</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="173"/>
+        <location filename="../equipment.c" line="213"/>
         <source>backplate weight</source>
         <translation>backplate weight</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="174"/>
+        <location filename="../equipment.c" line="214"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -2984,253 +3340,253 @@ Maximum</translation>
         <translation>Maximum number of supported columns on CSV import is %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>none</source>
         <translation>none</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>deco stop</source>
         <translation>deco stop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ascent</source>
         <translation>ascent</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ceiling</source>
         <translation>ceiling</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>workload</source>
         <translation>workload</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>transmitter</source>
         <translation>transmitter</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>violation</source>
         <translation>violation</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>bookmark</source>
         <translation>bookmark</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>surface</source>
         <translation>surface</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>safety stop</source>
         <translation>safety stop</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>gas change</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (voluntary)</source>
         <translation>safety stop (recommended)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (mandatory)</source>
         <translation>safety stop (mandatory)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>deepstop</source>
         <translation>deep stop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>ceiling (safety stop)</source>
         <translation>ceiling (safety stop)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>divetime</source>
         <translation>divetime</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>below floor</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>maxdepth</source>
         <translation>maxdepth</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>airtime</source>
         <translation>airtime</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>heading</source>
         <translation>heading</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>tissue level warning</source>
         <translation>tissue level warning</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>non stop time</source>
         <translation>no-stop time</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="163"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>invalid event number</source>
         <translation>invalid event number</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>Unable to create parser for %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="411"/>
+        <location filename="../libdivecomputer.c" line="414"/>
         <source>Error registering the data</source>
         <translation>Error registering data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="419"/>
+        <location filename="../libdivecomputer.c" line="422"/>
         <source>Error parsing the datetime</source>
         <translation>Error parsing the date/time</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="438"/>
         <source>Dive %d: %s %d %04d</source>
         <translation>Dive %d: %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="440"/>
+        <location filename="../libdivecomputer.c" line="443"/>
         <source>Error parsing the divetime</source>
         <translation>Error parsing the divetime</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="449"/>
+        <location filename="../libdivecomputer.c" line="452"/>
         <source>Error parsing the maxdepth</source>
         <translation>Error parsing the maxdepth</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="458"/>
+        <location filename="../libdivecomputer.c" line="461"/>
         <source>Error parsing the gas mix count</source>
         <translation>Error parsing the gas mix count</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="470"/>
+        <location filename="../libdivecomputer.c" line="473"/>
         <source>Error obtaining water salinity</source>
         <translation>Error obtaining water salinity</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error obtaining surface pressure</source>
         <translation>Error obtaining surface pressure</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the gas mix</source>
         <translation>Error parsing the gas mix</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="493"/>
+        <location filename="../libdivecomputer.c" line="496"/>
         <source>Error parsing the samples</source>
         <translation>Error parsing the samples</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="623"/>
+        <location filename="../libdivecomputer.c" line="626"/>
         <source>Event: waiting for user action</source>
         <translation>Event: waiting for user action</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>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="691"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the event handler.</source>
         <translation>Error registering the event handler.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="696"/>
+        <location filename="../libdivecomputer.c" line="699"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Error registering the cancellation handler.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="717"/>
+        <location filename="../libdivecomputer.c" line="720"/>
         <source>Dive data import error</source>
         <translation>Dive data import error</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="756"/>
+        <location filename="../libdivecomputer.c" line="759"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Unable to create libdivecomputer context</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="763"/>
+        <location filename="../libdivecomputer.c" line="766"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Unable to open %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="462"/>
+        <location filename="../parse-xml.c" line="466"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Strange percentage reading %s
 </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>Failed to parse &apos;%s&apos;</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>Database query get_events failed.
 </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>Database query get_tags failed.
@@ -3244,111 +3600,160 @@ Maximum</translation>
 </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 '%s'.
 </source>
         <translation>Database query failed &apos;%s&apos;.
 </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>Database query get_cylinders failed.
 </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>Database query get_changes failed.
 </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>Database query get_profile_sample failed.
 </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>Can&apos;t open stylesheet %s</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>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="146"/>
-        <location filename="../planner.c" line="617"/>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation>Can&apos;t find gas %d/%d</translation>
+        <location filename="../planner.c" line="159"/>
+        <location filename="../planner.c" line="752"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation>Can&apos;t find gas %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="308"/>
+        <location filename="../planner.c" line="345"/>
         <source>Too many gas mixes</source>
         <translation>Too many gas mixes</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="489"/>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</translation>
+        <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>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON IT, WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="530"/>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</translation>
+        <location filename="../planner.c" line="535"/>
+        <source>based on GFlow = %d and GFhigh = %d</source>
+        <translation>based on GFlow = %d and GFhigh = %d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="539"/>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</translation>
+        <location filename="../planner.c" line="538"/>
+        <source>Subsurface dive plan</source>
+        <translation>Subsurface dive plan</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="550"/>
-        <source>Switch gas to %s
-</source>
-        <translation>Switch gas to %s
-</translation>
+        <location filename="../planner.c" line="542"/>
+        <source>depth</source>
+        <translation>depth</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="558"/>
-        <source>Gas consumption:
-</source>
-        <translation>Gas consumption:
-</translation>
+        <location filename="../planner.c" line="545"/>
+        <source>runtime</source>
+        <translation>runtime</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="569"/>
-        <source>%.0f%s of %s
-</source>
-        <translation>%.0f%s of %s
-</translation>
+        <location filename="../planner.c" line="548"/>
+        <source>duration</source>
+        <translation>duration</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="551"/>
+        <source>gas</source>
+        <translation>gas</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>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</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>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="810"/>
+        <location filename="../planner.c" line="606"/>
+        <source>%3.0f%s</source>
+        <translation>%3.0f%s</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
+        <source>%3dmin</source>
+        <translation>%3dmin</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="629"/>
+        <source>Switch gas to %s</source>
+        <translation>Switch gas to %s</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="638"/>
+        <source>Gas consumption:</source>
+        <translation>Gas consumption:</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>Warning:</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="659"/>
+        <source>this is more gas than available in the specified cylinder!</source>
+        <translation>this is more gas than available in the specified cylinder!</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="664"/>
+        <source>not enough reserve for gas sharing on ascent!</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="668"/>
+        <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
+        <translation>%.0f%s (%.0f%s during planned ascent) of %s</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="683"/>
+        <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="980"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1226"/>
+        <location filename="../profile.c" line="1250"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3357,70 +3762,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1229"/>
+        <location filename="../profile.c" line="1253"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1233"/>
+        <location filename="../profile.c" line="1257"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1263"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </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>SAC: %2.1fl/min
+        <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1244"/>
+        <location filename="../profile.c" line="1268"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1246"/>
+        <location filename="../profile.c" line="1270"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1272"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="1274"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="1277"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1260"/>
+        <location filename="../profile.c" line="1284"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3429,7 +3834,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1264"/>
+        <location filename="../profile.c" line="1288"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3438,402 +3843,395 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1276"/>
+        <location filename="../profile.c" line="1300"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Safety Stop: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1279"/>
+        <location filename="../profile.c" line="1303"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Safety Stop: unkn time @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="1308"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
+        <location filename="../profile.c" line="1311"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: unkn time @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1291"/>
+        <location filename="../profile.c" line="1315"/>
         <source>In deco
 </source>
         <translation>In deco
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1293"/>
+        <location filename="../profile.c" line="1317"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1297"/>
+        <location filename="../profile.c" line="1321"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1305"/>
+        <location filename="../profile.c" line="1329"/>
         <source>In deco (calc)
 </source>
         <translation>In deco (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1307"/>
+        <location filename="../profile.c" line="1331"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1310"/>
+        <location filename="../profile.c" line="1334"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1313"/>
+        <location filename="../profile.c" line="1337"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Calculated ceiling %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1319"/>
+        <location filename="../profile.c" line="1343"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Tissue %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1325"/>
+        <location filename="../profile.c" line="1349"/>
         <source>heartbeat: %d
 </source>
         <translation>heartbeat: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1327"/>
+        <location filename="../profile.c" line="1351"/>
         <source>bearing: %d
 </source>
         <translation>bearing: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1419"/>
+        <location filename="../profile.c" line="1443"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</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>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1435"/>
+        <location filename="../profile.c" line="1459"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1439"/>
+        <location filename="../profile.c" line="1463"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</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>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1454"/>
+        <location filename="../profile.c" line="1478"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="273"/>
+        <location filename="../qt-gui.cpp" line="281"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="276"/>
+        <location filename="../qt-gui.cpp" line="284"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="392"/>
-        <source>%1, %2 %3, %4 %5:%6</source>
-        <translation>%1, %2 %3, %4 %5:%6</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="405"/>
-        <source>%1 %2, %3
-%4:%5</source>
-        <translation>%1 %2, %3
-%4:%5</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="418"/>
+        <location filename="../qt-gui.cpp" line="417"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 dives)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="423"/>
+        <location filename="../qt-gui.cpp" line="422"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 dive)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>boat</source>
         <translation>boat</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>shore</source>
         <translation>shore</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>drift</source>
         <translation>drift</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>deep</source>
         <translation>deep</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>cavern</source>
         <translation>cavern</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>ice</source>
         <translation>ice</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>wreck</source>
         <translation>wreck</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>cave</source>
         <translation>cave</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>altitude</source>
         <translation>altitude</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>pool</source>
         <translation>pool</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>lake</source>
         <translation>lake</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>river</source>
         <translation>river</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>night</source>
         <translation>night</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>fresh</source>
         <translation>fresh</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>student</source>
         <translation>student</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>photo</source>
         <translation>photo</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>video</source>
         <translation>video</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>instructor</source>
         <translation>instructor</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="25"/>
         <source>deco</source>
         <translation>deco</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="216"/>
+        <location filename="../dive.c" line="133"/>
+        <source>ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="214"/>
         <source>more than %d days</source>
         <translation>more than %d days</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="220"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="224"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="235"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation>for dive No.s</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="242"/>
+        <location filename="../statistics.c" line="240"/>
         <source>for selected dives</source>
         <translation>for selected dives</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="275"/>
         <source>for dive #%d</source>
         <translation>for dive No. %d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for selected dive</source>
         <translation>for selected dive</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for all dives</source>
         <translation>for all dives</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="283"/>
+        <location filename="../statistics.c" line="281"/>
         <source>(no dives)</source>
         <translation>(no dives)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sun</source>
         <translation>Sun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Mon</source>
         <translation>Mon</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Tue</source>
         <translation>Tue</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Wed</source>
         <translation>Wed</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Thu</source>
         <translation>Thu</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Fri</source>
         <translation>Fri</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sat</source>
         <translation>Sat</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>May</source>
         <translation>May</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Oct</source>
         <translation>Oct</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Dec</source>
         <translation>Dec</translation>
     </message>
@@ -3863,97 +4261,97 @@ Is the Uemis Zurich plugged in correctly?</source>
 Is the Uemis Zurich plugged in correctly?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="107"/>
+        <location filename="../uemis-downloader.c" line="111"/>
         <source>unknown</source>
         <translation>unknown</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="379"/>
+        <location filename="../uemis-downloader.c" line="383"/>
         <source>Reading %s %s</source>
         <translation>Reading %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="399"/>
+        <location filename="../uemis-downloader.c" line="403"/>
         <source>data</source>
         <translation>data</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="420"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>divelog entry id</source>
         <translation>divelog entry id</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="422"/>
+        <location filename="../uemis-downloader.c" line="426"/>
         <source>divespot data id</source>
         <translation>divespot data id</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
+        <location filename="../uemis-downloader.c" line="428"/>
         <source>more data dive id</source>
         <translation>more data dive id</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>wetsuit</source>
         <translation>wetsuit</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>semidry</source>
         <translation>semidry</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>drysuit</source>
         <translation>drysuit</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>shorty</source>
         <translation>shorty</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>vest</source>
         <translation>vest</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>long john</source>
         <translation>long john</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>jacket</source>
         <translation>jacket</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>full suit</source>
         <translation>full suit</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>2 pcs full suit</source>
         <translation>2 pcs full suit</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="620"/>
+        <location filename="../uemis-downloader.c" line="624"/>
         <source>membrane</source>
         <translation>membrane</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="802"/>
+        <location filename="../uemis-downloader.c" line="823"/>
         <source>Init Communication</source>
         <translation>Init Communication</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="804"/>
+        <location filename="../uemis-downloader.c" line="825"/>
         <source>Uemis init failed</source>
         <translation>Uemis init failed</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="815"/>
+        <location filename="../uemis-downloader.c" line="836"/>
         <source>Start download</source>
         <translation>Start download</translation>
     </message>
@@ -3974,18 +4372,18 @@ Is the Uemis Zurich plugged in correctly?</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="203"/>
-        <source>PO2 Green Warning</source>
-        <translation>PO2 Green Warning</translation>
+        <source>pO₂ Green Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
-        <source>PO2 Ascend Warning</source>
-        <translation>PO2 Ascend Warning</translation>
+        <source>pO₂ Ascend Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="208"/>
-        <source>PO2 Ascend Alarm</source>
-        <translation>PO2 Ascend Alarm</translation>
+        <source>pO₂ Ascend Alarm</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
@@ -4047,5 +4445,214 @@ Is the Uemis Zurich plugged in correctly?</translation>
         <source>Low Battery Alert</source>
         <translation>Low Battery Alert</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>Can&apos;t open file %s</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="36"/>
+        <source>Date:</source>
+        <translation>Date:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="38"/>
+        <source>Time:</source>
+        <translation>Time:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="40"/>
+        <source>Duration:</source>
+        <translation>Duration:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="41"/>
+        <source>min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="43"/>
+        <source>Max Depth:</source>
+        <translation>Max Depth:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="46"/>
+        <source>Air Temp:</source>
+        <translation>Air Temp:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="48"/>
+        <source>Water Temp:</source>
+        <translation>Water Temp:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="50"/>
+        <source>Location:</source>
+        <translation>Location:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="54"/>
+        <source>Notes:</source>
+        <translation>Notes:</translation>
+    </message>
+</context>
+<context>
+    <name>plannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="14"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="35"/>
+        <source>Rates</source>
+        <translation>Rates</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="56"/>
+        <source>Ascent</source>
+        <translation>Ascent</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="77"/>
+        <source>below 75% avg. depth</source>
+        <translation>below 75% avg. depth</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>m/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="94"/>
+        <source>75%-50% avg. depth</source>
+        <translation>75%-50% avg. depth</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="111"/>
+        <source>50% avg. depth - 6m/20ft</source>
+        <translation>50% avg. depth - 6m/20ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="128"/>
+        <source>6m/20ft to surface</source>
+        <translation>6m/20ft to surface</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="148"/>
+        <source>Descent</source>
+        <translation>Descent</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="200"/>
+        <source>surface to the bottom</source>
+        <translation>surface to the bottom</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="226"/>
+        <source>Planning</source>
+        <translation>Planning</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="247"/>
+        <source>GF low</source>
+        <translation>GF low</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="264"/>
+        <source>GF high</source>
+        <translation>GF high</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
+        <source>Drop to first depth</source>
+        <translation>Drop to first depth</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
+        <source>Last Stop at 6m/20ft</source>
+        <translation>Last Stop at 6m/20ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>plan backgas breaks</source>
+        <translation>plan backgas breaks</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="318"/>
+        <source>Gas Options</source>
+        <translation>Gas options</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <source>bottom SAC</source>
+        <translation>bottom SAC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="349"/>
+        <source>deco SAC</source>
+        <translation>deco SAC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="359"/>
+        <source>bottom pO₂</source>
+        <translation>bottom pO₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="389"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="382"/>
+        <source>deco pO₂</source>
+        <translation>deco pO₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="421"/>
+        <source>Dive Notes</source>
+        <translation>Dive Notes</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+        <source>In dive plan, show runtime (absolute time) of stops</source>
+        <translation>In dive plan, show runtime (absolute time) of stops</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="445"/>
+        <source>display runtime</source>
+        <translation>display runtime</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="458"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
+        <translation>In dive plan, show duration (relative time) of stops</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="461"/>
+        <source>display segment duration</source>
+        <translation>display segment duration</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="471"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
+        <translation>In dive plan, list transitions or treat them as implicit</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="474"/>
+        <source>display transitions in deco</source>
+        <translation>display transitions in deco</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="481"/>
+        <source>verbatim diveplan</source>
+        <translation>verbatim dive plan</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_es_ES.ts b/translations/subsurface_es_ES.ts
index cced48259..51ebfc8ca 100644
--- a/translations/subsurface_es_ES.ts
+++ b/translations/subsurface_es_ES.ts
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="es_ES" version="2.0">
+<defaultcodec>UTF-8</defaultcodec>
 <context>
     <name>CylindersModel</name>
     <message>
@@ -37,42 +38,42 @@
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="71"/>
+        <location filename="../qt-ui/models.cpp" line="70"/>
         <source>Switch at</source>
         <translation>Cambio a </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>Pulsar aquí borrará esta botella</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>La botella no puede borrarse</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>Gas en uso. Solo  pueden borrarse botellas que no se usan en la inmersión.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="507"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="508"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="527"/>
+        <location filename="../qt-ui/models.cpp" line="532"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="528"/>
+        <location filename="../qt-ui/models.cpp" line="533"/>
         <source>cuft</source>
         <translation>pie³</translation>
     </message>
@@ -100,22 +101,22 @@ el ordenador de buceo seleccionado?</translation>
 <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>Modelo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Device ID</source>
         <translation>ID del dispositivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Nickname</source>
         <translation>Nombre</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>Pulsar aquí borrará este ordenador de buceo.</translation>
     </message>
@@ -123,190 +124,326 @@ el ordenador de buceo seleccionado?</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="90"/>
-        <source>air</source>
-        <translation>aire</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="92"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</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>Cambio de emergencia a OC</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>comienzo</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>fin</translation>
     </message>
 </context>
 <context>
-    <name>DiveGasPressureItem</name>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="475"/>
-        <source>air</source>
-        <translation>aire</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="476"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-</context>
-<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1258"/>
-        <source> l/min</source>
-        <translation>l/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
-        <source> cuft/min</source>
-        <translation>Pie³/min</translation>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <source>/min</source>
+        <translation>/min</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>Mostrar ventana de busqueda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="706"/>
         <source>expand all</source>
         <translation>Expandir todo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="740"/>
+        <location filename="../qt-ui/divelistview.cpp" line="707"/>
         <source>collapse all</source>
         <translation>Encoger todo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="741"/>
+        <location filename="../qt-ui/divelistview.cpp" line="708"/>
         <source>collapse others</source>
         <translation>Encoger otros</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>Borrar inmersión(es) del viaje</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>Crear nuevo viaje arriba</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>Añadir inmersión(es) al viaje de arriba</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>Añadir inmersión(es) al viaje de debajo</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>mezclar viaje con el viaje de arriba</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>mezclar viaje con el viaje de abajo</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>Borrar inmersión(es)</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>Marcar inmersión(es) como inválida</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
-        <source>save As</source>
-        <translation>Guardar como</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="763"/>
-        <source>export As UDDF</source>
-        <translation>Exportar como UDDF</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="764"/>
-        <source>export As CSV</source>
-        <translation>Exportar a CSV</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="744"/>
+        <source>renumber dive(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="765"/>
+        <location filename="../qt-ui/divelistview.cpp" line="745"/>
         <source>shift times</source>
         <translation>Desplazar horas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="766"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>load images</source>
         <translation>Carga imágenes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="769"/>
-        <source>upload dive(s) to divelogs.de</source>
-        <translation>Subir inmersión(es) a divelogs.de</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Open Image Files</source>
+        <translation>Abrir archivo de imagen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation>Archivos de imagen (</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <source>merge selected dives</source>
+        <translation>Mezclar las inmersiones seleccionadas</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="24"/>
+        <source>General Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="30"/>
+        <source>Export format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="42"/>
+        <source>Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="61"/>
+        <source>UDDF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="74"/>
+        <source>divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="84"/>
+        <source>CSV</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="94"/>
+        <source>Worldmap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="107"/>
+        <source>Selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="116"/>
+        <source>Selected dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="126"/>
+        <source>All dives</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="795"/>
-        <source>Save Dives As...</source>
-        <translation>Guardar las inmersiones como…</translation>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="178"/>
+        <source>HTML</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="814"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="184"/>
+        <source>General Settings</source>
+        <translation>Ajustes generales</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="190"/>
+        <source>Subsurface Numbers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="203"/>
+        <source>Selected Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="216"/>
+        <source>Minimum Javascript</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="229"/>
+        <source>All Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="239"/>
+        <source>Export List only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="252"/>
+        <source>Style Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="264"/>
+        <source>Font</source>
+        <translation>Tipo de letra</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="274"/>
+        <source>Font size</source>
+        <translation>Tamaño de letra</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
+        <source>8</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <source>10</source>
+        <translation>10</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <source>12</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <source>14</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <source>16</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <source>18</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <source>20</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="323"/>
+        <source>Theme</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <source>Sand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="153"/>
         <source>Export UDDF File as</source>
         <translation>Exportar archivo UDDF</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>Archivos UDDF (*.uddf *.UDDF)</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>Exportar archivo CSV</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>Archivos CSV (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Open Image Files</source>
-        <translation>Abrir archivo de imagen</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="162"/>
+        <source>Export World Map</source>
+        <translation>Exportar Mapamundi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
-        <translation>Archivos de imagen (</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="163"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="177"/>
+        <source>HTML files (*.html)</source>
+        <translation>Archivos HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="760"/>
-        <source>merge selected dives</source>
-        <translation>Mezclar las inmersiones seleccionadas</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="167"/>
+        <source>Export Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="168"/>
+        <source>XML files (*.xml *.ssrf)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="176"/>
+        <source>Export HTML files as</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -317,138 +454,133 @@ el ordenador de buceo seleccionado?</translation>
         <translation>Importar archivo de registro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="36"/>
-        <source>Import CSV Dive Log Files</source>
-        <translation>Importar archivo de registro CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="50"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
         <source>CSV options</source>
         <translation>Opciones de CSV</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="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>Separador de campos</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>Importaciones pre-configuradas</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>Configuración de campos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="80"/>
         <source>Depth</source>
         <translation>Profundidad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="100"/>
         <source>Stopdepth</source>
         <translation>Profundidad de parada</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="107"/>
         <source>PO2</source>
         <translation>PO2</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>Hora de entrada</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="121"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="151"/>
         <source>Cns</source>
         <translation>Cns</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>Unidades</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>Métrico</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>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="248"/>
         <source>Manual dives</source>
         <translation>Inmersiones manuales</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="283"/>
         <source>Dive #</source>
         <translation>Inmersión #</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="317"/>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="385"/>
         <source>Duration</source>
         <translation>Duración</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="470"/>
         <source>Tags</source>
         <translation>Etiquetas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
         <source>Location</source>
         <translation>Ubicación</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="453"/>
         <source>Gps</source>
         <translation>Gps</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="300"/>
         <source>Max depth</source>
         <translation>Profundidad máxima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="334"/>
         <source>Mean depth</source>
         <translation>Profundidad media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="368"/>
         <source>Buddy</source>
         <translation>Compañero</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="402"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="436"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
@@ -456,105 +588,70 @@ el ordenador de buceo seleccionado?</translation>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="71"/>
-        <source>Bottom SAC</source>
-        <translation>CAS en fondo</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="106"/>
+        <source>Planned Dive Time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="85"/>
-        <source>SAC on DECO Stop</source>
-        <translation>CAS en parada DECO</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="134"/>
+        <source>Altitude</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="78"/>
-        <source>GFHigh</source>
-        <translation>GF alto</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="98"/>
-        <source>GFLow</source>
-        <translation>GF bajo</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="125"/>
-        <source>Last Stop at 6m</source>
-        <translation>Última parada a 6m</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="174"/>
-        <source>Start Time</source>
-        <translation>Hora de inicio</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="181"/>
+        <location filename="../qt-ui/diveplanner.ui" line="141"/>
         <source>ATM Pressure</source>
         <translation>Presión atmosférica</translation>
     </message>
-</context>
-<context>
-    <name>DivePlannerGraphics</name>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="114"/>
-        <source>10m</source>
-        <translation>10m</translation>
-    </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="116"/>
-        <source>30ft</source>
-        <translation>30ft</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="148"/>
+        <source>mbar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="363"/>
-        <source>Handler Position Error</source>
-        <translation>Error en la posición del punto</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>
-        <translation>Una o más de tus paradas se perderán con estas operaciones.
-Por favor, bórralas antes.</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="158"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="445"/>
-        <source>AIR</source>
-        <translation>AIRE</translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="137"/>
+        <source>unknown</source>
+        <translation>desconocido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1148"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="586"/>
         <source>Final Depth</source>
         <translation>Profundidad final</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1150"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="588"/>
         <source>Run time</source>
         <translation>Tiempo de ejecución</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1152"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="590"/>
         <source>Duration</source>
         <translation>Duración</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1154"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="592"/>
         <source>Used Gas</source>
         <translation>Gas usado</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>CC Set Point</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>¿Quiere descartar el plan?</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>Está a punto de descartar su plan.</translation>
     </message>
@@ -562,17 +659,17 @@ Por favor, bórralas antes.</translation>
 <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>Puntos del planificador de inmersiones</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="256"/>
         <source>Available Gases</source>
         <translation>Gases disponibles</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>Añadir punto de datos de inmersión.</translation>
     </message>
@@ -616,8 +713,23 @@ Por favor, bórralas antes.</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
-        <source>Pressure  S</source>
-        <translation>Presión S</translation>
+        <source>Pressure S</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <source>pN₂</source>
+        <translation>pN₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>pHe</source>
+        <translation>pHe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
@@ -634,86 +746,71 @@ Por favor, bórralas antes.</translation>
         <source>SAC</source>
         <translation>CAS</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
-        <source>PN2</source>
-        <translation>PN2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
-        <source>PHE</source>
-        <translation>PHE</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
-        <source>PO2</source>
-        <translation>PO2</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>N.º</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>date</source>
         <translation>Fecha</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1298"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
+        <location filename="../qt-ui/models.cpp" line="1307"/>
         <source>suit</source>
         <translation>traje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1310"/>
         <source>cyl</source>
         <translation>bot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1344"/>
+        <location filename="../qt-ui/models.cpp" line="1325"/>
         <source>location</source>
         <translation>Ubicación</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1316"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1338"/>
+        <location filename="../qt-ui/models.cpp" line="1319"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1341"/>
+        <location filename="../qt-ui/models.cpp" line="1322"/>
         <source>maxCNS</source>
         <translation>maxCNS</translation>
     </message>
@@ -721,115 +818,115 @@ Por favor, bórralas antes.</translation>
 <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>Respuesta del servidor no válida.</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>No se encontró la etiqueta XML esperada «DiveDateReader», se obtuvo en su lugar «%1»</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>No se encontró la etiqueta XML esperada «DiveDates»</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>Respuesta XML mal formada. Línea </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>No se seleccionó ninguna inmersión</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>Fallo al crear archivo .zip para subir: %s</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>No puedo crear archivo temporal: %s</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>Error interno: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="181"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="179"/>
         <source>internal error</source>
         <translation>Error interno</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>Hecho</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>Subiendo lista de inmersiones…</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>Descargando lista de inmersiones…</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>Descargando %1 inmersiones…</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>Descarga finalizada - </translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
         <source>Corrupted download</source>
         <translation>Descarga corrompida</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>El archivo no pudo abrirse
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Upload failed</source>
         <translation>La subida ha fallado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="849"/>
         <source>Upload successful</source>
         <translation>Subida correcta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="854"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="852"/>
         <source>Login failed</source>
         <translation>El acceso ha fallado</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>No se puede leer la respuesta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="868"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Error: %1</source>
         <translation>Error: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="835"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/>
         <source>Upload finished</source>
         <translation>Subida finalizada</translation>
     </message>
@@ -837,54 +934,54 @@ Por favor, bórralas antes.</translation>
 <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>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="165"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/>
         <source>Error</source>
         <translation>Error</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>Intentar de nuevo</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>Encontrar ordenador de buceo Uemis</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>Selecciona archivo para registro de descarga de libdivecomputer</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>Archivos Log (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="339"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
         <source>Warning</source>
         <translation>Advertencia</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>Guardar el volcado de libdivecomputer NO descargará buceos a la lista de inmersiones.</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>Selecciona archivo para el volcado binario del ordenador de buceo</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>Archivos de volcado (*.bin)</translation>
     </message>
@@ -952,7 +1049,7 @@ Por favor, bórralas antes.</translation>
 <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>Editar los puntos de buceo seleccionados.</translation>
     </message>
@@ -961,848 +1058,854 @@ Por favor, bórralas antes.</translation>
     <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>Notas de la inmersión</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>Ubicación</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="148"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Coordinates</source>
         <translation>Coordenadas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="169"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="155"/>
+        <location filename="../qt-ui/maintab.ui" line="148"/>
         <source>Buddy</source>
         <translation>Compañero</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="63"/>
-        <source>Start time</source>
-        <translation>Hora de inicio</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>Temperatura del aire</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>Temperatura del agua</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="127"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Tags</source>
         <translation>Etiquetas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="223"/>
         <source>Rating</source>
         <translation>Valoración</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="236"/>
         <source>Visibility</source>
         <translation>Visibilidad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="215"/>
+        <location filename="../qt-ui/maintab.ui" line="127"/>
         <source>Suit</source>
         <translation>Traje</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>Notas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="270"/>
+        <location filename="../qt-ui/maintab.ui" line="311"/>
         <source>Equipment</source>
         <translation>Equipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="350"/>
+        <location filename="../qt-ui/maintab.ui" line="391"/>
         <source>Dive Info</source>
         <translation>Información de la inmersión</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>Fecha</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="414"/>
+        <location filename="../qt-ui/maintab.ui" line="275"/>
+        <source>Time</source>
+        <translation>Hora de entrada</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="455"/>
         <source>Interval</source>
         <translation>Intervalo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="433"/>
+        <location filename="../qt-ui/maintab.ui" line="474"/>
         <source>Gases Used</source>
         <translation>Gases usados</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="452"/>
+        <location filename="../qt-ui/maintab.ui" line="493"/>
         <source>Gas Consumed</source>
         <translation>Gas consumido</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>CAS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="531"/>
         <source>Max. Depth</source>
         <translation>Profundidad máxima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="509"/>
+        <location filename="../qt-ui/maintab.ui" line="550"/>
         <source>Ave. Depth</source>
         <translation>Profundidad media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="528"/>
+        <location filename="../qt-ui/maintab.ui" line="569"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="547"/>
+        <location filename="../qt-ui/maintab.ui" line="588"/>
         <source>Air Pressure</source>
         <translation>Presión atmosférica</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="566"/>
+        <location filename="../qt-ui/maintab.ui" line="607"/>
         <source>Air Temperature</source>
         <translation>Temperatura del aire</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="585"/>
+        <location filename="../qt-ui/maintab.ui" line="626"/>
         <source>Water Temperature</source>
         <translation>Temperatura del agua</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="604"/>
+        <location filename="../qt-ui/maintab.ui" line="645"/>
         <source>Dive Time</source>
         <translation>Duración de la inmersión</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="623"/>
+        <location filename="../qt-ui/maintab.ui" line="664"/>
         <source>Salinity</source>
         <translation>Salinidad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="660"/>
+        <location filename="../qt-ui/maintab.ui" line="701"/>
         <source>Stats</source>
         <translation>Estadísticas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="746"/>
         <source>Depth</source>
         <translation>Profundidad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="784"/>
         <source>Duration</source>
         <translation>Duración</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Total Time</source>
         <translation>Tiempo total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="835"/>
         <source>Dives</source>
         <translation>Inmersiones</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="919"/>
+        <source>Photos</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="89"/>
         <source>Cylinders</source>
         <translation>Botellas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="90"/>
         <source>Add Cylinder</source>
         <translation>Añadir botella</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="93"/>
         <source>Weights</source>
         <translation>Lastre</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>Añadir sistema de lastre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="438"/>
+        <location filename="../qt-ui/maintab.cpp" line="409"/>
         <source>Trip Location</source>
         <translation>Ubicación del viaje</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>Notas del viaje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="42"/>
+        <location filename="../qt-ui/maintab.cpp" line="48"/>
         <source>Save</source>
         <translation>Guardar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="46"/>
+        <location filename="../qt-ui/maintab.cpp" line="52"/>
         <source>Cancel</source>
         <translation>Cancelar</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>Temp. Aire [%1]</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>Temp. Agua [%1]</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>Este viaje está siendo editado.</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>Se están editando varias inmersiones.</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>Esta inmersión esta siendo editada.</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>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="494"/>
+        <location filename="../qt-ui/maintab.cpp" line="464"/>
         <source>unknown</source>
         <translation>desconocido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>N</source>
-        <translation>N</translation>
+        <location filename="../qt-ui/maintab.cpp" line="501"/>
+        <source>Deepest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>S</source>
-        <translation>S</translation>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <source>Shallowest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>E</source>
-        <translation>E</translation>
+        <location filename="../qt-ui/maintab.cpp" line="794"/>
+        <source>Discard the Changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>W</source>
-        <translation>O</translation>
+        <location filename="../qt-ui/maintab.cpp" line="795"/>
+        <source>You are about to discard your changes.</source>
+        <translation type="unfinished"/>
     </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>Filtros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="571"/>
+        <location filename="../qt-ui/mainwindow.ui" line="646"/>
         <source>&amp;File</source>
         <translation>Archivo</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="583"/>
+        <source>Print</source>
+        <translation>Imprimir</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:'Courier'; 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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
         <source>&amp;Log</source>
         <translation>Registro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="606"/>
+        <location filename="../qt-ui/mainwindow.ui" line="679"/>
         <source>&amp;View</source>
         <translation>&amp;Vista</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="628"/>
+        <location filename="../qt-ui/mainwindow.ui" line="701"/>
         <source>&amp;Help</source>
         <translation>Ayuda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="636"/>
+        <location filename="../qt-ui/mainwindow.ui" line="709"/>
         <source>&amp;Import</source>
         <translation>&amp;Importar</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>&amp;Nuevo registro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="655"/>
+        <location filename="../qt-ui/mainwindow.ui" line="728"/>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="658"/>
+        <location filename="../qt-ui/mainwindow.ui" line="731"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</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>Abrir registr&amp;o</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="666"/>
+        <location filename="../qt-ui/mainwindow.ui" line="739"/>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <location filename="../qt-ui/mainwindow.ui" line="742"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="674"/>
+        <location filename="../qt-ui/mainwindow.ui" line="747"/>
         <source>&amp;Save</source>
         <translation>Guardar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="677"/>
+        <location filename="../qt-ui/mainwindow.ui" line="750"/>
         <source>Save</source>
         <translation>Guardar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="680"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>Save as</source>
         <translation>Guardar como</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>Ctrl+Shift+S</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>&amp;Cerrar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="702"/>
+        <location filename="../qt-ui/mainwindow.ui" line="775"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="902"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <source>P&amp;references</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="831"/>
+        <source>&amp;Add Dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <source>Auto &amp;Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="863"/>
+        <source>&amp;Dive List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="871"/>
+        <source>&amp;Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="879"/>
+        <source>&amp;Info</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="887"/>
+        <source>&amp;All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="895"/>
+        <source>P&amp;rev DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="903"/>
+        <source>&amp;Next DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="911"/>
+        <source>&amp;Select Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <source>&amp;About Subsurface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="937"/>
+        <source>&amp;Globe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="953"/>
+        <source>&amp;Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="959"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="707"/>
-        <source>Export &amp;UDDF</source>
-        <translation>Exportar &amp;UDDF</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="1008"/>
+        <source>&amp;Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1011"/>
+        <source>Export Dive Logs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1014"/>
+        <source>Ctrl+E</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Enable the pN2 Graph</source>
         <translation>Activar el gráfico de pN2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <location filename="../qt-ui/mainwindow.ui" line="128"/>
         <source>Enable the pHe graph</source>
         <translation>Activar el gráfico de pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <location filename="../qt-ui/mainwindow.ui" line="290"/>
         <source>Show/hide heart rate</source>
         <translation>Mostrar/ocultar el ritmo cardiaco</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <location filename="../qt-ui/mainwindow.ui" line="342"/>
         <source>Enable EAD, END, and EADD</source>
         <translation>Activar PEA, PNE y EADD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="238"/>
         <source>Show NDL / TTS</source>
         <translation>Mostrar el NDL/TTS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="456"/>
+        <location filename="../qt-ui/mainwindow.ui" line="394"/>
         <source>Rescale depth axis</source>
         <translation>Cambiar de escala  el eje de profundidad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="710"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="715"/>
-        <source>Export HTML World Map</source>
-        <translation>Exportar Mapamundi en HTML</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="718"/>
-        <source>Ctrl+H</source>
-        <translation>Ctrl+H</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="723"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>&amp;Print</source>
         <translation>Im&amp;primir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="734"/>
+        <location filename="../qt-ui/mainwindow.ui" line="791"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="742"/>
+        <location filename="../qt-ui/mainwindow.ui" line="799"/>
         <source>&amp;Quit</source>
         <translation>Salir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="753"/>
+        <location filename="../qt-ui/mainwindow.ui" line="810"/>
         <source>Import from &amp;dive computer</source>
         <translation>Importar del or&amp;denador de buceo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="818"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation>Importar datos &amp;GPS del Servicio Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="764"/>
+        <location filename="../qt-ui/mainwindow.ui" line="821"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="826"/>
         <source>&amp;Edit Device Names</source>
         <translation>&amp;Editar nombres de dispositivos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="834"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="782"/>
+        <location filename="../qt-ui/mainwindow.ui" line="839"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Renumerar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="785"/>
+        <location filename="../qt-ui/mainwindow.ui" line="842"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="798"/>
+        <location filename="../qt-ui/mainwindow.ui" line="855"/>
         <source>&amp;Yearly Statistics</source>
         <translation>Estadísticas anuales</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="801"/>
+        <location filename="../qt-ui/mainwindow.ui" line="858"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="806"/>
-        <source>Dive List</source>
-        <translation>Lista de inmersiones</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="814"/>
-        <source>Profile</source>
-        <translation>Perfil</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="822"/>
-        <source>Info</source>
-        <translation>Info</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="830"/>
-        <source>All</source>
-        <translation>Todo</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="872"/>
+        <location filename="../qt-ui/mainwindow.ui" line="929"/>
         <source>User &amp;Manual</source>
         <translation>&amp;Manual de usuario</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="880"/>
-        <source>Globe</source>
-        <translation>Globo </translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="888"/>
+        <location filename="../qt-ui/mainwindow.ui" line="945"/>
         <source>P&amp;lan Dive</source>
         <translation>P&amp;lanificar Inmersión</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="891"/>
+        <location filename="../qt-ui/mainwindow.ui" line="948"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="907"/>
-        <source>Import from Divelogs.de</source>
-        <translation>Importar desde Divelogs.de</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1003"/>
         <source>&amp;Check for Updates</source>
         <translation>&amp;Comprobar si hay actualizaciones</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="951"/>
-        <source>Export CSV</source>
-        <translation>Exportar CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="726"/>
+        <location filename="../qt-ui/mainwindow.ui" line="783"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</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>Activar el gráfico de pO2</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>…</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="316"/>
         <source>Enable MOD</source>
         <translation>Activar la PMO</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>Mostrar techo informado por el ordenador</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>Mostrar techo calculado por Subsurface</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>Mostrar el techo calculado con incrementos de 3m</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>Calcular todos los tejidos</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>Mostrar tasa de CAS</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>Activar / Desactivar la regla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="731"/>
-        <source>Preferences</source>
-        <translation>Preferencias</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="745"/>
+        <location filename="../qt-ui/mainwindow.ui" line="802"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="756"/>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="774"/>
-        <source>Add Dive</source>
-        <translation>Añadir inmersión</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="793"/>
-        <source>Auto Group</source>
-        <translation>Auto agrupar</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="809"/>
+        <location filename="../qt-ui/mainwindow.ui" line="866"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="817"/>
+        <location filename="../qt-ui/mainwindow.ui" line="874"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <location filename="../qt-ui/mainwindow.ui" line="882"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="833"/>
+        <location filename="../qt-ui/mainwindow.ui" line="890"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="838"/>
-        <source>Prev DC</source>
-        <translation>Anterior ordenador</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="841"/>
+        <location filename="../qt-ui/mainwindow.ui" line="898"/>
         <source>Left</source>
         <translation>Izquierda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="846"/>
-        <source>Next DC</source>
-        <translation>Siguiente ordenador</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="849"/>
+        <location filename="../qt-ui/mainwindow.ui" line="906"/>
         <source>Right</source>
         <translation>Derecha</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="854"/>
-        <source>Select Events</source>
-        <translation>Seleccionar eventos</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <location filename="../qt-ui/mainwindow.ui" line="916"/>
         <source>Input Plan</source>
         <translation>Introducir Plan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="864"/>
-        <source>About Subsurface</source>
-        <translation>Acerca de Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="875"/>
+        <location filename="../qt-ui/mainwindow.ui" line="932"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="883"/>
+        <location filename="../qt-ui/mainwindow.ui" line="940"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="896"/>
-        <source>Import Log Files</source>
-        <translation>Importar archivos de registro</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="899"/>
+        <location filename="../qt-ui/mainwindow.ui" line="956"/>
         <source>Import divelog files from other applications</source>
         <translation>Importar archivos de registro de otras aplicaciones</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="915"/>
+        <location filename="../qt-ui/mainwindow.ui" line="964"/>
+        <source>Import &amp;from Divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="972"/>
         <source>&amp;Full Screen</source>
         <translation>Pantalla completa</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>Activar pantalla completa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <location filename="../qt-ui/mainwindow.ui" line="978"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="174"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
         <source>Open File</source>
         <translation>Abrir archivo</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>Por favor, guarda o cancela la edición de la inmersión actual antes de cerrar el archivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="330"/>
-        <source>Please save or cancel the current dive edit before trying to plan a dive.</source>
-        <translation>Por favor, guarda o cancela la edición de la inmersión actual antes de intentar planificar otra.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="396"/>
+        <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>Por favor, guarda o cancela la edición de la inmersión actual antes de intentar añadir otra.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="645"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="419"/>
+        <source>Print runtime table</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="710"/>
         <source>Do you want to save the changes you made in the file %1?</source>
         <translation>¿Quiere guardar los cambios realizados en el archivo %1?</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>¿Quiere guardar los cambios realizados en el archivo de datos?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="652"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="717"/>
         <source>Save Changes?</source>
         <translation>¿Guardar los cambios?</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>Se perderán los cambios si no los guarda.</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>Guardar archivo como</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>Advertencia</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>Por favor, guarda o cancela la edición de la inmersión actual antes de abrir otro archivo.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="280"/>
-        <source>Export UDDF File as</source>
-        <translation>Exportar archivo UDDF</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="281"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>Archivos UDDF (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="289"/>
-        <source>Export CSV File as</source>
-        <translation>Exportar archivo CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="290"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>Archivos CSV (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="299"/>
-        <source>Export World Map</source>
-        <translation>Exportar Mapamundi</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="300"/>
-        <source>HTML files (*.html)</source>
-        <translation>Archivos HTML (*.html)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="449"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="514"/>
         <source>Yearly Statistics</source>
         <translation>Estadísticas anuales</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="961"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1076"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Archivos XML de Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1199"/>
         <source>Open Dive Log File</source>
         <translation>Abrir archivo de registro de inmersiones</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <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>Archivos de registro  (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;Archivos XML (*.xml);;Archivos UDDF/UDCF (*.uddf *.udcf);;Archivos Jdivelog (*.jlb);;Archivos Suunto (*.sde *.db);;Archivos CSV (*.csv);;Todos los archivos (*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1225"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Por favor, termina la edición actual antes de intentar hacer otra.</translation>
     </message>
 </context>
 <context>
+    <name>PlannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Last stop at 20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="416"/>
+        <source>Last stop at 6m</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>PreferencesDialog</name>
     <message>
         <location filename="../qt-ui/preferences.ui" line="85"/>
@@ -1825,247 +1928,297 @@ Por favor, bórralas antes.</translation>
         <translation>Lenguaje</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="151"/>
         <source>Lists and Tables</source>
         <translation>Listas y tablas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font</source>
         <translation>Tipo de letra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="167"/>
         <source>Font size</source>
         <translation>Tamaño de letra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="170"/>
+        <location filename="../qt-ui/preferences.ui" line="180"/>
         <source>Dives</source>
         <translation>Inmersiones</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>Archivo de inmersiones por defecto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="188"/>
+        <location filename="../qt-ui/preferences.ui" line="198"/>
         <source>...</source>
         <translation>…</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="197"/>
+        <location filename="../qt-ui/preferences.ui" line="207"/>
         <source>Display Invalid</source>
         <translation>Mostrar no validas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="214"/>
+        <location filename="../qt-ui/preferences.ui" line="224"/>
         <source>Default Cylinder</source>
         <translation>Botella por defecto</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>Usar botella por defecto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <location filename="../qt-ui/preferences.ui" line="247"/>
         <source>Animations</source>
         <translation>Animaciones</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <location filename="../qt-ui/preferences.ui" line="253"/>
         <source>Speed</source>
         <translation>Velocidad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="270"/>
+        <location filename="../qt-ui/preferences.ui" line="280"/>
         <source>Subsurface Webservice</source>
         <translation>Servicio Web de Subsurface</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>ID de usuario por defecto</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>¿Guardar localmente la ID de usuario?</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="312"/>
+        <source>Reset all settings to their default value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
         <source>System</source>
         <translation>Sistema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="348"/>
         <source>Metric</source>
         <translation>Métrico</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="333"/>
+        <location filename="../qt-ui/preferences.ui" line="358"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="343"/>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
         <source>Personalize</source>
         <translation>Personalizar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="392"/>
         <source>Depth</source>
         <translation>Profundidad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="374"/>
+        <location filename="../qt-ui/preferences.ui" line="399"/>
         <source>meter</source>
         <translation>metro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="409"/>
         <source>feet</source>
         <translation>pie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="401"/>
+        <location filename="../qt-ui/preferences.ui" line="426"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="411"/>
+        <location filename="../qt-ui/preferences.ui" line="436"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="428"/>
+        <location filename="../qt-ui/preferences.ui" line="453"/>
         <source>liter</source>
         <translation>litro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="438"/>
+        <location filename="../qt-ui/preferences.ui" line="463"/>
         <source>cu ft</source>
         <translation>pie³</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="455"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="465"/>
+        <location filename="../qt-ui/preferences.ui" line="490"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="482"/>
+        <location filename="../qt-ui/preferences.ui" line="507"/>
         <source>kg</source>
         <translation>kg</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>Umbral al mostrar la pO2</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>Umbral al mostrar la pN2</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>Umbral al mostrar la pHe</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="636"/>
-        <source>max ppO₂ when showing MOD</source>
-        <translation>ppO2 máxima al mostrar la PMO</translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="811"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="817"/>
+        <source>Proxy type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="830"/>
+        <source>Host</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="856"/>
+        <source>Port</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="882"/>
+        <source>Requires authentication</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="657"/>
+        <location filename="../qt-ui/preferences.ui" line="925"/>
+        <source>Password</source>
+        <translation>Contraseña</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="682"/>
         <source>draw dive computer reported ceiling red</source>
         <translation>Trazar en rojo el techo informado por el ordenador de buceo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="747"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>System Default</source>
         <translation>Predeterminado del sistema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="767"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>Filter</source>
         <translation>Filtros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="419"/>
         <source>Pressure</source>
         <translation>Presión</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="421"/>
+        <location filename="../qt-ui/preferences.ui" line="446"/>
         <source>Volume</source>
         <translation>Volumen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="448"/>
+        <location filename="../qt-ui/preferences.ui" line="473"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="475"/>
+        <location filename="../qt-ui/preferences.ui" line="500"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="517"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="507"/>
+        <location filename="../qt-ui/preferences.ui" line="532"/>
         <source>Time units</source>
         <translation>Unidades de tiempo</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>Denominador de la velocidad de ascenso/descenso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="520"/>
+        <location filename="../qt-ui/preferences.ui" line="545"/>
         <source>Minutes</source>
         <translation>Minutos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="530"/>
+        <location filename="../qt-ui/preferences.ui" line="555"/>
         <source>Seconds</source>
         <translation>Segundos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="562"/>
+        <location filename="../qt-ui/preferences.ui" line="587"/>
         <source>Show</source>
         <translation>Mostrar</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="693"/>
         <source>Show non-used cylinders in Equipment Tab</source>
         <translation>Mostrar botellas no usadas en la pestaña Equipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="679"/>
+        <location filename="../qt-ui/preferences.ui" line="704"/>
         <source>show average depth</source>
         <translation>Mostrar la profundidad media</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>GF bajo a la máxima profundidad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="691"/>
+        <location filename="../qt-ui/preferences.ui" line="716"/>
         <source>Misc</source>
         <translation>Varios</translation>
     </message>
@@ -2075,35 +2228,65 @@ Por favor, bórralas antes.</translation>
         <translation>Preferencias</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="697"/>
+        <location filename="../qt-ui/preferences.ui" line="722"/>
         <source>GFLow</source>
         <translation>GF bajo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="739"/>
         <source>GFHigh</source>
         <translation>GF alto</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="24"/>
+        <source>System proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="25"/>
+        <source>HTTP proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="26"/>
+        <source>SOCKS proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="245"/>
         <source>Restart required</source>
         <translation>Reinicio requerido</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>Para cargar correctamente un nuevo lenguaje debes reiniciar Subsurface.</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>Abrir archivo de registro por defecto</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>Archivos XML de Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="394"/>
+        <source>Warning</source>
+        <translation>Advertencia</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"/>
+    </message>
 </context>
 <context>
     <name>PrintDialog</name>
@@ -2244,72 +2427,72 @@ Por favor, bórralas antes.</translation>
 <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>desconocido</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>Inmersión n.º %1 - %2</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>Profundidad máxima: %1 %2</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>Duración: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1918"/>
+        <location filename="../qt-ui/models.cpp" line="1898"/>
         <source>Gas Used:</source>
         <translation>Gas usado:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1920"/>
+        <location filename="../qt-ui/models.cpp" line="1900"/>
         <source>SAC:</source>
         <translation>CAS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1922"/>
+        <location filename="../qt-ui/models.cpp" line="1902"/>
         <source>Max. CNS:</source>
         <translation>Max. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1924"/>
+        <location filename="../qt-ui/models.cpp" line="1904"/>
         <source>Weights:</source>
         <translation>Lastre:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1929"/>
+        <location filename="../qt-ui/models.cpp" line="1909"/>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1936"/>
+        <location filename="../qt-ui/models.cpp" line="1916"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1938"/>
+        <location filename="../qt-ui/models.cpp" line="1918"/>
         <source>Buddy:</source>
         <translation>Compañero:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1940"/>
+        <location filename="../qt-ui/models.cpp" line="1920"/>
         <source>Suit:</source>
         <translation>Traje:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1942"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>Viz:</source>
         <translation>Visibilidad:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1944"/>
+        <location filename="../qt-ui/models.cpp" line="1924"/>
         <source>Rating:</source>
         <translation>Calificación:</translation>
     </message>
@@ -2317,62 +2500,77 @@ Por favor, bórralas antes.</translation>
 <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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/>
+        <source>Make first divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="906"/>
+        <source>Delete this divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="913"/>
         <source>Add Gas Change</source>
         <translation>Añadir cambio de gas</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>Añadir marcador</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>Borrar evento</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>Ocultar eventos similares</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>Editar nombre</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>Revelar todos los eventos</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>Ocultar eventos</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>¿ Ocultar todos los eventos %1 ?</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>¿ Borrar el evento seleccionado ?</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>%1 @ %2:%3</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>Editar el nombre de la marca</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>Nombre personalizado:</translation>
     </message>
@@ -2380,12 +2578,12 @@ Por favor, bórralas antes.</translation>
 <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>AIRE</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>Borrar este punto</translation>
     </message>
@@ -2395,22 +2593,22 @@ Por favor, bórralas antes.</translation>
         <translation>Cerrar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="34"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation>Promedio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="37"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation>Mínima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="40"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation>Máxima</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>Mueve el mapa y haz doble click para fijar la posición del buceo</translation>
     </message>
@@ -2424,9 +2622,23 @@ Por favor, bórralas antes.</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="128"/>
         <source>New starting number</source>
         <translation>Número de partida nuevo</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="126"/>
+        <source>New number</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchBar</name>
+    <message>
+        <location filename="../qt-ui/searchbar.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulario</translation>
+    </message>
 </context>
 <context>
     <name>ShiftImageTimesDialog</name>
@@ -2441,42 +2653,47 @@ Por favor, bórralas antes.</translation>
         <translation>Desplazar la hora de la(s) imagen(es) en</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="102"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="95"/>
+        <source>h:mm</source>
+        <translation>h:mm</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="105"/>
         <source>earlier</source>
         <translation>más pronto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="109"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="112"/>
         <source>later</source>
         <translation>más tarde</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>Para calcular la desviación entre los relojes de tu ordenador de buceo y tu cámara utiliza esta última para sacar una foto de tu ordenador de buceo mientras muestra la hora actual. Descarga esa imagen a tu ordenador y pulsa este botón.</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>Determinar la desviación de la hora de la cámara</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>Selecciona la imagen del ordenador de buceo mostrando la hora</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>¿ Que fecha y hora se muestran en la imagen ?</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>Abrir archivo de imagen</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>Archivos de imagen (</translation>
     </message>
@@ -2556,42 +2773,42 @@ Por favor, bórralas antes.</translation>
 <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>Servicio web</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/>
         <source>Connecting...</source>
         <translation>Conectando…</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="421"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="419"/>
         <source>Download finished</source>
         <translation>Descarga finalizada</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>Error de descarga: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/>
         <source>Connection Error: </source>
         <translation>Error de conexión:</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>El identificador de usuario no es válido.</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>No se puede analizar la respuesta.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/>
         <source>Download Success!</source>
         <translation>Se ha completado la descarga correctamente.</translation>
     </message>
@@ -2607,17 +2824,17 @@ Por favor, bórralas antes.</translation>
 <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>Descripción</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2625,7 +2842,7 @@ Por favor, bórralas antes.</translation>
 <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>Información</translation>
     </message>
@@ -2633,42 +2850,42 @@ Por favor, bórralas antes.</translation>
 <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>Buscar actualizaciones</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="37"/>
-        <source>&lt;h3&gt;Subsurface was unable to check for updates.&lt;/h3&gt;</source>
-        <translation>&lt;h3&gt;Subsurface no pudo buscar actualizaciones&lt;/h3&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="36"/>
+        <source>Subsurface was unable to check for updates.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
-        <source>&lt;br/&gt;&lt;b&gt;The following error occurred:&lt;/b&gt;&lt;br/&gt;</source>
-        <translation>&lt;br/&gt;&lt;b&gt;Ha ocurrido el siguiente error:&lt;/b&gt;&lt;br/&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="41"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="43"/>
-        <source>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Please check your internet connection.&lt;/b&gt;</source>
-        <translation>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Por favor, comprueba tu conexión a internet.&lt;/b&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
     </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>Estás usando la última versión de Subsurface</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>Está disponible una nueva versión de Subsurface. &lt;br/&gt;Clica en:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; para descargarla.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="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>&lt;b&gt;Está disponible una nueva versión de Subsurface.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</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>Hubo un error al intentar buscar actualizaciones. &lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -2676,25 +2893,163 @@ Por favor, bórralas antes.</translation>
 <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>Manual de usuario</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>No puedo encontrar el manual de Subsurface</translation>
     </message>
 </context>
 <context>
+    <name>UserSurvey</name>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="47"/>
+        <source>Subsurface User Survey</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="79"/>
+        <source>Recreational DIver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="92"/>
+        <source>Tech Diver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="105"/>
+        <source>Interested in dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="118"/>
+        <source>I am downloading dives from supported dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="131"/>
+        <source>I am importing dives from other software / sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="144"/>
+        <source>I am manually entering dives</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="190"/>
+        <source>Please type suggestions (in English) in the following box</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="27"/>
+        <source>
+Operating System: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="30"/>
+        <source>
+CPU Architecture: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="35"/>
+        <source>
+OS CPU Architecture %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="39"/>
+        <source>
+Language: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="73"/>
+        <source>Should we ask you later?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="74"/>
+        <source>Don&apos;t ask me again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="75"/>
+        <source>Ask Later</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="76"/>
+        <source>Ask again?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <source>Submit User Survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <source>Subsurface was unable to submit the user survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="101"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="102"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="111"/>
+        <source>Survey successfully submitted.</source>
+        <translation type="unfinished"/>
+    </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>Hubo un error al intentar buscar actualizaciones. &lt;br/&gt;&lt;br/&gt;%1</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>Descripción</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="723"/>
+        <location filename="../qt-ui/models.cpp" line="721"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2742,12 +3097,12 @@ Por favor, bórralas antes.</translation>
         <translation>Subir</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>Tiempo de espera sobrepasado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="279"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="277"/>
         <source>Transfering data...</source>
         <translation>Transfiriendo datos…</translation>
     </message>
@@ -2755,37 +3110,37 @@ Por favor, bórralas antes.</translation>
 <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>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="368"/>
+        <location filename="../qt-ui/models.cpp" line="373"/>
         <source>Weight</source>
         <translation>Peso</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>Pulsar aquí borrará este sistema de lastre.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="453"/>
+        <location filename="../qt-ui/models.cpp" line="458"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="454"/>
+        <location filename="../qt-ui/models.cpp" line="459"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="478"/>
+        <location filename="../qt-ui/models.cpp" line="483"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="484"/>
         <source>m</source>
         <translation>m</translation>
     </message>
@@ -2793,79 +3148,79 @@ Por favor, bórralas antes.</translation>
 <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>Año
 &gt; Mes / Viaje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>#</source>
         <translation>N.º</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1643"/>
         <source>Duration 
  Total</source>
         <translation>Duración
 Total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>
 Average</source>
         <translation>
 Media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>
 Shortest</source>
         <translation>
 Más corta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>
 Longest</source>
         <translation>
 Más larga</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>Profundidad (%1)
 Media</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>
 Mínimo</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>
 Máximo</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>CAS (%1)
 Medio</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>Temp. (%1)
@@ -2875,99 +3230,92 @@ Media</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="58"/>
+        <location filename="../dive.c" line="87"/>
         <source>pascal</source>
         <translation>pascal</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>bar</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>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="104"/>
-        <location filename="../qt-gui.cpp" line="292"/>
-        <source>l</source>
-        <translation>l</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>pie³</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>m</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>ft</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>lbs</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>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1120"/>
+        <location filename="../dive.c" line="1237"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) o (%s)</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>aire</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="170"/>
+        <location filename="../equipment.c" line="210"/>
         <source>integrated</source>
         <translation>integrado</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="171"/>
+        <location filename="../equipment.c" line="211"/>
         <source>belt</source>
         <translation>cinturón</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="172"/>
+        <location filename="../equipment.c" line="212"/>
         <source>ankle</source>
         <translation>tobillo</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="173"/>
+        <location filename="../equipment.c" line="213"/>
         <source>backplate weight</source>
         <translation>lastre en el arnes</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="174"/>
+        <location filename="../equipment.c" line="214"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -2984,253 +3332,253 @@ Media</translation>
         <translation>El máximo número de columnas que soporta importar CSV es %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>none</source>
         <translation>ninguno</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>deco stop</source>
         <translation>parada deco</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ascent</source>
         <translation>ascenso</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ceiling</source>
         <translation>techo</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>workload</source>
         <translation>carga</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>transmitter</source>
         <translation>transmisor</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>violation</source>
         <translation>violación</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>bookmark</source>
         <translation>marcador</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>surface</source>
         <translation>superficie</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>safety stop</source>
         <translation>parada de seguridad</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>cambio de mezcla</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (voluntary)</source>
         <translation>parada de seguridad (voluntaria)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (mandatory)</source>
         <translation>parada de seguridad (obligatoria)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>deepstop</source>
         <translation>parada de profundidad</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>ceiling (safety stop)</source>
         <translation>techo (parada de seguridad)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>divetime</source>
         <translation>duración de inmersión</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>por debajo del techo</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>maxdepth</source>
         <translation>Profundidad Max</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>airtime</source>
         <translation>tiempo de aire</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>heading</source>
         <translation>encabezado</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>tissue level warning</source>
         <translation>Alarma de nivel de tejidos</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>non stop time</source>
         <translation>tiempo sin parada</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="163"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>invalid event number</source>
         <translation>el número de evento no es válido</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>No es posible crear el analizador para %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="411"/>
+        <location filename="../libdivecomputer.c" line="414"/>
         <source>Error registering the data</source>
         <translation>Error al registrar los datos</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="419"/>
+        <location filename="../libdivecomputer.c" line="422"/>
         <source>Error parsing the datetime</source>
         <translation>Error al analizar la fecha</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="438"/>
         <source>Dive %d: %s %d %04d</source>
         <translation>Inmersión n.º %d: %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="440"/>
+        <location filename="../libdivecomputer.c" line="443"/>
         <source>Error parsing the divetime</source>
         <translation>Error al analizar el tiempo de buceo</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="449"/>
+        <location filename="../libdivecomputer.c" line="452"/>
         <source>Error parsing the maxdepth</source>
         <translation>Error al analizar la máxima profundidad</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="458"/>
+        <location filename="../libdivecomputer.c" line="461"/>
         <source>Error parsing the gas mix count</source>
         <translation>Error al analizar el conteo de mezcla de gas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="470"/>
+        <location filename="../libdivecomputer.c" line="473"/>
         <source>Error obtaining water salinity</source>
         <translation>Error al obtener salinidad del agua</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error obtaining surface pressure</source>
         <translation>Error al obtener la presión en superficie</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the gas mix</source>
         <translation>Error al analizar la mezcla de gas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="493"/>
+        <location filename="../libdivecomputer.c" line="496"/>
         <source>Error parsing the samples</source>
         <translation>Error al analizar las muestras</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="623"/>
+        <location filename="../libdivecomputer.c" line="626"/>
         <source>Event: waiting for user action</source>
         <translation>Evento: esperando acción del usuario</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>modelo=%u (0x%08x), firmware=%u (0x%08x), n.º de serie=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="691"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the event handler.</source>
         <translation>Error al registrar el manejador de eventos</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="696"/>
+        <location filename="../libdivecomputer.c" line="699"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Error al registrar el manejador de cancelación</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="717"/>
+        <location filename="../libdivecomputer.c" line="720"/>
         <source>Dive data import error</source>
         <translation>Error al importar datos de inmersiones</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="756"/>
+        <location filename="../libdivecomputer.c" line="759"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>No es posible crear el contexto de libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="763"/>
+        <location filename="../libdivecomputer.c" line="766"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>No se pudo abrir  %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="462"/>
+        <location filename="../parse-xml.c" line="466"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Porcentaje extraño al leer %s
 </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>No se pudo analizar «%s»</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>Falló la petición get_events a la base de datos.
 </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>Consulta de la base de datos get_tags falló.
@@ -3244,111 +3592,160 @@ Media</translation>
 </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 '%s'.
 </source>
         <translation>Falló la petición a la base de datos «%s».
 </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>Consulta de la base de datos get_cylinders falló.
 </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>Consulta de la base de datos get_changes falló.
 </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>Consulta de la base de datos get_profile_sample falló.
 </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>No se puede abrir la hoja de estilo %s</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>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="146"/>
-        <location filename="../planner.c" line="617"/>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation>No encuentro el gas %d/%d</translation>
+        <location filename="../planner.c" line="159"/>
+        <location filename="../planner.c" line="752"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="308"/>
+        <location filename="../planner.c" line="345"/>
         <source>Too many gas mixes</source>
         <translation>Demasiadas mezclas de gas</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="489"/>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation>%s
-Plan de buceo de Subsurface
-basado en GFbajo = %.0f  y  GFalto = %.0f
-
-</translation>
+        <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>DESCARGO DE RESPONSABILIDAD / AVISO:  ESTA ES UNA NUEVA IMPLEMENTACIÓN DEL ALGORITMO BUHLMANN Y UNA IMPLEMENTACIÓN DE UN PLANIFICADOR DE INMERSIÓN BASADO EN ÉL QUE SOLO HA SIDO PROBADA DE FORMA LIMITADA.   RECOMENDAMOS FIRMEMENTE NO PLANIFICAR INMERSIONES BASADAS SIMPLEMENTE EN LOS RESULTADOS QUE SE OBTENGAN AQUÍ.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="530"/>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Cambio de cota a %.*f %s en %d:%02d min - runtime %d:%02u con %s
-</translation>
+        <location filename="../planner.c" line="535"/>
+        <source>based on GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="539"/>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Permanecer a  %.*f %s durante %d:%02d min - runtime %d:%02u en %s
-</translation>
+        <location filename="../planner.c" line="538"/>
+        <source>Subsurface dive plan</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="550"/>
-        <source>Switch gas to %s
-</source>
-        <translation>Cambio de gas a %s
-</translation>
+        <location filename="../planner.c" line="542"/>
+        <source>depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="558"/>
-        <source>Gas consumption:
-</source>
-        <translation>Consumo de gas:
-</translation>
+        <location filename="../planner.c" line="545"/>
+        <source>runtime</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="569"/>
-        <source>%.0f%s of %s
-</source>
-        <translation>%.0f%s de %s
-</translation>
+        <location filename="../planner.c" line="548"/>
+        <source>duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="551"/>
+        <source>gas</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="606"/>
+        <source>%3.0f%s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
+        <source>%3dmin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="629"/>
+        <source>Switch gas to %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="638"/>
+        <source>Gas consumption:</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="659"/>
+        <source>this is more gas than available in the specified cylinder!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="810"/>
+        <location filename="../planner.c" line="664"/>
+        <source>not enough reserve for gas sharing on ascent!</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="668"/>
+        <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="980"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1226"/>
+        <location filename="../profile.c" line="1250"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3357,70 +3754,69 @@ Prof: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1229"/>
+        <location filename="../profile.c" line="1253"/>
         <source>P: %d%s
 </source>
         <translation>Pres: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1233"/>
+        <location filename="../profile.c" line="1257"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1263"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </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>CAS: %2.1fl/min
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1244"/>
+        <location filename="../profile.c" line="1268"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1246"/>
+        <location filename="../profile.c" line="1270"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1272"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="1274"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="1277"/>
         <source>MOD: %d%s
 </source>
         <translation>PMO: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1260"/>
+        <location filename="../profile.c" line="1284"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3429,7 +3825,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1264"/>
+        <location filename="../profile.c" line="1288"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3438,401 +3834,394 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1276"/>
+        <location filename="../profile.c" line="1300"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Parada de seguridad: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1279"/>
+        <location filename="../profile.c" line="1303"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Parada de seguridad: tiempo desc @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="1308"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Parada deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
+        <location filename="../profile.c" line="1311"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Parada deco: tiempo desc @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1291"/>
+        <location filename="../profile.c" line="1315"/>
         <source>In deco
 </source>
         <translation>En deco</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1293"/>
+        <location filename="../profile.c" line="1317"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1297"/>
+        <location filename="../profile.c" line="1321"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Parada deco: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1305"/>
+        <location filename="../profile.c" line="1329"/>
         <source>In deco (calc)
 </source>
         <translation>En deco (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1307"/>
+        <location filename="../profile.c" line="1331"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1310"/>
+        <location filename="../profile.c" line="1334"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1313"/>
+        <location filename="../profile.c" line="1337"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Techo calculado %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1319"/>
+        <location filename="../profile.c" line="1343"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Tejido %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1325"/>
+        <location filename="../profile.c" line="1349"/>
         <source>heartbeat: %d
 </source>
         <translation>Ritmo cardiaco: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1327"/>
+        <location filename="../profile.c" line="1351"/>
         <source>bearing: %d
 </source>
         <translation>Soporte: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1419"/>
+        <location filename="../profile.c" line="1443"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</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>%s %sProf:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1435"/>
+        <location filename="../profile.c" line="1459"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sProf:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1439"/>
+        <location filename="../profile.c" line="1463"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</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>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1454"/>
+        <location filename="../profile.c" line="1478"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sPres:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="273"/>
+        <location filename="../qt-gui.cpp" line="281"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="276"/>
+        <location filename="../qt-gui.cpp" line="284"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="392"/>
-        <source>%1, %2 %3, %4 %5:%6</source>
-        <translation>%1, %2 %3, %4 %5:%6</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="405"/>
-        <source>%1 %2, %3
-%4:%5</source>
-        <translation>%1 %2, %3
-%4:%5</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="418"/>
+        <location filename="../qt-gui.cpp" line="417"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 inmersiones)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="423"/>
+        <location filename="../qt-gui.cpp" line="422"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 inmersión)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>boat</source>
         <translation>barco</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>shore</source>
         <translation>orilla</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>drift</source>
         <translation>a la deriva</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>deep</source>
         <translation>profunda</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>cavern</source>
         <translation>caverna</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>ice</source>
         <translation>hielo</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>wreck</source>
         <translation>pecio</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>cave</source>
         <translation>cueva</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>altitude</source>
         <translation>altura</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>pool</source>
         <translation>piscina</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>lake</source>
         <translation>lago</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>river</source>
         <translation>río</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>night</source>
         <translation>noche</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>fresh</source>
         <translation>agua dulce</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>student</source>
         <translation>estudiante</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>photo</source>
         <translation>foto</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>video</source>
         <translation>vídeo</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>instructor</source>
         <translation>instructor</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="25"/>
         <source>deco</source>
         <translation>deco</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="216"/>
+        <location filename="../dive.c" line="133"/>
+        <source>ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="214"/>
         <source>more than %d days</source>
         <translation>más de %d días</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="220"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd, %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="224"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="235"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation>para las inmersiones n.º</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="242"/>
+        <location filename="../statistics.c" line="240"/>
         <source>for selected dives</source>
         <translation>para las inmersiones seleccionadas</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="275"/>
         <source>for dive #%d</source>
         <translation>para la inmersión n.º %d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for selected dive</source>
         <translation>para la inmersión seleccionada</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for all dives</source>
         <translation>Todas las inmersiones</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="283"/>
+        <location filename="../statistics.c" line="281"/>
         <source>(no dives)</source>
         <translation>(ninguna inmersión)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sun</source>
         <translation>Do</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Mon</source>
         <translation>Lu</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Tue</source>
         <translation>Ma</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Wed</source>
         <translation>Mi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Thu</source>
         <translation>Ju</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Fri</source>
         <translation>Vi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sat</source>
         <translation>Sa</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jan</source>
         <translation>Ene</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Apr</source>
         <translation>Abr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>May</source>
         <translation>Mayo</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Aug</source>
         <translation>Ago</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Oct</source>
         <translation>Oct</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Dec</source>
         <translation>Dic</translation>
     </message>
@@ -3862,97 +4251,97 @@ Is the Uemis Zurich plugged in correctly?</source>
 ¿Está el Uemis Zúrich correctamente conectado?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="107"/>
+        <location filename="../uemis-downloader.c" line="111"/>
         <source>unknown</source>
         <translation>desconocido</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="379"/>
+        <location filename="../uemis-downloader.c" line="383"/>
         <source>Reading %s %s</source>
         <translation>Leyendo %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="399"/>
+        <location filename="../uemis-downloader.c" line="403"/>
         <source>data</source>
         <translation>datos</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="420"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>divelog entry id</source>
         <translation>identificador de entrada del diario</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="422"/>
+        <location filename="../uemis-downloader.c" line="426"/>
         <source>divespot data id</source>
         <translation>identificador del punto de buceo</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
+        <location filename="../uemis-downloader.c" line="428"/>
         <source>more data dive id</source>
         <translation>más datos para el identificador de  inmersión</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>wetsuit</source>
         <translation>traje húmedo</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>semidry</source>
         <translation>semiseco</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>drysuit</source>
         <translation>traje seco</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>shorty</source>
         <translation>shorty</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>vest</source>
         <translation>chaleco</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>long john</source>
         <translation>long john</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>jacket</source>
         <translation>chaleco</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>full suit</source>
         <translation>traje completo</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>2 pcs full suit</source>
         <translation>traje completo 2 piezas</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="620"/>
+        <location filename="../uemis-downloader.c" line="624"/>
         <source>membrane</source>
         <translation>membrana</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="802"/>
+        <location filename="../uemis-downloader.c" line="823"/>
         <source>Init Communication</source>
         <translation>Iniciar comunicación</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="804"/>
+        <location filename="../uemis-downloader.c" line="825"/>
         <source>Uemis init failed</source>
         <translation>Fallo al intentar iniciar Uemis</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="815"/>
+        <location filename="../uemis-downloader.c" line="836"/>
         <source>Start download</source>
         <translation>Iniciar la descarga</translation>
     </message>
@@ -3973,18 +4362,18 @@ Is the Uemis Zurich plugged in correctly?</source>
     </message>
     <message>
         <location filename="../uemis.c" line="203"/>
-        <source>PO2 Green Warning</source>
-        <translation>Aviso verde de PO2</translation>
+        <source>pO₂ Green Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
-        <source>PO2 Ascend Warning</source>
-        <translation>Aviso de ascenso de PO2</translation>
+        <source>pO₂ Ascend Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="208"/>
-        <source>PO2 Ascend Alarm</source>
-        <translation>Alarma de ascenso de PO2</translation>
+        <source>pO₂ Ascend Alarm</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
@@ -4046,5 +4435,214 @@ Is the Uemis Zurich plugged in correctly?</source>
         <source>Low Battery Alert</source>
         <translation>Alerta de batería baja</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"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="36"/>
+        <source>Date:</source>
+        <translation>Fecha:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="38"/>
+        <source>Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="40"/>
+        <source>Duration:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="41"/>
+        <source>min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="43"/>
+        <source>Max Depth:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="46"/>
+        <source>Air Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="48"/>
+        <source>Water Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="50"/>
+        <source>Location:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="54"/>
+        <source>Notes:</source>
+        <translation>Notas:</translation>
+    </message>
+</context>
+<context>
+    <name>plannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulario</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="35"/>
+        <source>Rates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="56"/>
+        <source>Ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="77"/>
+        <source>below 75% avg. depth</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="94"/>
+        <source>75%-50% avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="111"/>
+        <source>50% avg. depth - 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="128"/>
+        <source>6m/20ft to surface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="148"/>
+        <source>Descent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="200"/>
+        <source>surface to the bottom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="226"/>
+        <source>Planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="247"/>
+        <source>GF low</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="264"/>
+        <source>GF high</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
+        <source>Drop to first depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
+        <source>Last Stop at 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>plan backgas breaks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="318"/>
+        <source>Gas Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <source>bottom SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="349"/>
+        <source>deco SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="359"/>
+        <source>bottom pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="389"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="382"/>
+        <source>deco pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="421"/>
+        <source>Dive Notes</source>
+        <translation>Notas de la inmersión</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="445"/>
+        <source>display runtime</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="458"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="461"/>
+        <source>display segment duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="471"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="474"/>
+        <source>display transitions in deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="481"/>
+        <source>verbatim diveplan</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_et_EE.ts b/translations/subsurface_et_EE.ts
index ce9caab5f..cfbec9622 100644
--- a/translations/subsurface_et_EE.ts
+++ b/translations/subsurface_et_EE.ts
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="et_EE" version="2.0">
+<defaultcodec>UTF-8</defaultcodec>
 <context>
     <name>CylindersModel</name>
     <message>
@@ -37,42 +38,42 @@
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="71"/>
+        <location filename="../qt-ui/models.cpp" line="70"/>
         <source>Switch at</source>
         <translation>Vaheta</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>Siin klikkamine eemaldab selle ballooni</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>Ballooni ei saa eemaldada</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>See gaas on kasutusel. Eemaldada saab ainult neid balloone mida ei kasutata sellel sukeldumisel.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="507"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="508"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="527"/>
+        <location filename="../qt-ui/models.cpp" line="532"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="528"/>
+        <location filename="../qt-ui/models.cpp" line="533"/>
         <source>cuft</source>
         <translation>kuupjalg</translation>
     </message>
@@ -100,22 +101,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>Mudel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Device ID</source>
         <translation>Seadme ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Nickname</source>
         <translation>Hüüdnimi</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>Siin klikkamine eemaldab selle kompuutri.</translation>
     </message>
@@ -123,190 +124,326 @@
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="90"/>
-        <source>air</source>
-        <translation>õhk</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="92"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</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>Üleminek avatud süsteemile</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> algus</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> lõpp</translation>
     </message>
 </context>
 <context>
-    <name>DiveGasPressureItem</name>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="475"/>
-        <source>air</source>
-        <translation>õhk</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="476"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-</context>
-<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1258"/>
-        <source> l/min</source>
-        <translation>l/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
-        <source> cuft/min</source>
-        <translation>kuupjalga/min</translation>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <source>/min</source>
+        <translation>/min</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>Näita otsinguakent</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="706"/>
         <source>expand all</source>
         <translation>laienda kõik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="740"/>
+        <location filename="../qt-ui/divelistview.cpp" line="707"/>
         <source>collapse all</source>
         <translation>ahenda kõik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="741"/>
+        <location filename="../qt-ui/divelistview.cpp" line="708"/>
         <source>collapse others</source>
         <translation>ahenda muud</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>kõrvalda sukeldumine/sukeldumised väljasõidust</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>loo uus väljasõit ülal</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>lisa sukeldumine/sukeldumised väljasõitu kohe eespool </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>lisa sukeldumine(sed) vahetult allolevale väljasõidule </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>ühenda väljasõit väljasõiduga ülal</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>ühenda väljasõit väljasõiduga all</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>kustuta sukeldumine/sukeldumised</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>Märgista sukeldumine/sukeldumised ebaõnnestunuks</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
-        <source>save As</source>
-        <translation>salvesta nimega</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="763"/>
-        <source>export As UDDF</source>
-        <translation>ekspordi UDDF kujul</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="764"/>
-        <source>export As CSV</source>
-        <translation>Ekspordi CSV failina</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="744"/>
+        <source>renumber dive(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="765"/>
+        <location filename="../qt-ui/divelistview.cpp" line="745"/>
         <source>shift times</source>
         <translation>nihuta ajad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="766"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>load images</source>
         <translation>laadi pildid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="769"/>
-        <source>upload dive(s) to divelogs.de</source>
-        <translation>lae sukeldumised divelogs.de keskkonda</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Open Image Files</source>
+        <translation>Ava pildifailid</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation>Pildifailid (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <source>merge selected dives</source>
+        <translation>ühenda valitud sukeldumised</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="24"/>
+        <source>General Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="30"/>
+        <source>Export format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="42"/>
+        <source>Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="61"/>
+        <source>UDDF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="74"/>
+        <source>divelogs.de</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="795"/>
-        <source>Save Dives As...</source>
-        <translation>Salvesta sukeldumised nimega...</translation>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="84"/>
+        <source>CSV</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="94"/>
+        <source>Worldmap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="107"/>
+        <source>Selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="116"/>
+        <source>Selected dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="126"/>
+        <source>All dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="178"/>
+        <source>HTML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="184"/>
+        <source>General Settings</source>
+        <translation>Üldised seaded</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="190"/>
+        <source>Subsurface Numbers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="203"/>
+        <source>Selected Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="216"/>
+        <source>Minimum Javascript</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="229"/>
+        <source>All Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="239"/>
+        <source>Export List only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="252"/>
+        <source>Style Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="264"/>
+        <source>Font</source>
+        <translation>Font</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="274"/>
+        <source>Font size</source>
+        <translation>Fondi suurus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="814"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
+        <source>8</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <source>10</source>
+        <translation>10</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <source>12</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <source>14</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <source>16</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <source>18</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <source>20</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="323"/>
+        <source>Theme</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <source>Sand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="153"/>
         <source>Export UDDF File as</source>
         <translation>Ekspordi UDDF fail kujul</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>UDDF failid (*.uddf *.UDDF)</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>Eksport CSV fail kujul</translation>
+        <translation>Ekspordi CSV fail kujul</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>CSV failid (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Open Image Files</source>
-        <translation>Ava pildifailid</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="162"/>
+        <source>Export World Map</source>
+        <translation>Ekspordi maailmakaart</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
-        <translation>Pildifailid (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="163"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="177"/>
+        <source>HTML files (*.html)</source>
+        <translation>HTML failid (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="760"/>
-        <source>merge selected dives</source>
-        <translation>ühenda valitud sukeldumised</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="167"/>
+        <source>Export Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="168"/>
+        <source>XML files (*.xml *.ssrf)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="176"/>
+        <source>Export HTML files as</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -317,138 +454,133 @@
         <translation>Impordi sukeldumiste logi fail</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="36"/>
-        <source>Import CSV Dive Log Files</source>
-        <translation>Impordi CSV sukeldumiste logi failid</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="50"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
         <source>CSV options</source>
         <translation>CSV valikud</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="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>Välja eraldaja</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>Eelseadistatud impordid</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>Välja konfiguratsioon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="80"/>
         <source>Depth</source>
         <translation>Sügavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="100"/>
         <source>Stopdepth</source>
         <translation>Peatuse sügavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="107"/>
         <source>PO2</source>
         <translation>PO2</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>Aeg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="121"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="151"/>
         <source>Cns</source>
         <translation>Cns</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>Ühikud</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>SI</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>Briti/Ameerika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="248"/>
         <source>Manual dives</source>
         <translation>Käsitsi sisestatud sukeldumised</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="283"/>
         <source>Dive #</source>
         <translation>Sukeldumise #</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="317"/>
         <source>Date</source>
         <translation>Kuupäev</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="385"/>
         <source>Duration</source>
         <translation>Kestus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="470"/>
         <source>Tags</source>
         <translation>Märgendid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
         <source>Location</source>
         <translation>Asukoht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="453"/>
         <source>Gps</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="300"/>
         <source>Max depth</source>
         <translation>Max sügavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="334"/>
         <source>Mean depth</source>
         <translation>Keskmine sügavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="368"/>
         <source>Buddy</source>
         <translation>Semu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="402"/>
         <source>Notes</source>
         <translation>Märkmed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="436"/>
         <source>Weight</source>
         <translation>Raskus</translation>
     </message>
@@ -456,105 +588,70 @@
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="71"/>
-        <source>Bottom SAC</source>
-        <translation>SAC põhjas</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="106"/>
+        <source>Planned Dive Time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="85"/>
-        <source>SAC on DECO Stop</source>
-        <translation>SAC dekopeatusel</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="134"/>
+        <source>Altitude</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="78"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="98"/>
-        <source>GFLow</source>
-        <translation>GFLow</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="125"/>
-        <source>Last Stop at 6m</source>
-        <translation>Viimane peatus 6m peal</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="174"/>
-        <source>Start Time</source>
-        <translation>Algusaeg</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="181"/>
+        <location filename="../qt-ui/diveplanner.ui" line="141"/>
         <source>ATM Pressure</source>
         <translation>ATM rõhk</translation>
     </message>
-</context>
-<context>
-    <name>DivePlannerGraphics</name>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="114"/>
-        <source>10m</source>
-        <translation>10m</translation>
-    </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="116"/>
-        <source>30ft</source>
-        <translation>30 jalga</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="148"/>
+        <source>mbar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="363"/>
-        <source>Handler Position Error</source>
-        <translation>Draiveri asukoha viga</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>
-        <translation>Üks või enam peatust läheb selle operatsiooniga kaotsi,
-palun eemalda need esmalt.</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="158"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="445"/>
-        <source>AIR</source>
-        <translation>ÕHK</translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="137"/>
+        <source>unknown</source>
+        <translation>tundmatu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1148"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="586"/>
         <source>Final Depth</source>
         <translation>Lõppsügavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1150"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="588"/>
         <source>Run time</source>
         <translation>Töö aeg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1152"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="590"/>
         <source>Duration</source>
         <translation>Kestus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1154"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="592"/>
         <source>Used Gas</source>
         <translation>Kasutatud gaas</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>CC seadepunkt</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>Loobu plaanist?</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>Oled plaanist loobumas.</translation>
     </message>
@@ -562,17 +659,17 @@ palun eemalda need esmalt.</translation>
 <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>Sukeldumise planeerija punktid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="256"/>
         <source>Available Gases</source>
         <translation>Saadavad gaasid</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>lisa sukeldumise andmete punkt</translation>
     </message>
@@ -616,8 +713,23 @@ palun eemalda need esmalt.</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
-        <source>Pressure  S</source>
-        <translation>Rõhk S</translation>
+        <source>Pressure S</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <source>pN₂</source>
+        <translation>pN₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>pHe</source>
+        <translation>pHE</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
@@ -634,86 +746,71 @@ palun eemalda need esmalt.</translation>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
-        <source>PN2</source>
-        <translation>PN2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
-        <source>PHE</source>
-        <translation>PHE</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
-        <source>PO2</source>
-        <translation>PO2</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>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>date</source>
         <translation>kuupäev</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>ft</source>
         <translation>jalg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1298"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>lbs</source>
         <translation>nael</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
+        <location filename="../qt-ui/models.cpp" line="1307"/>
         <source>suit</source>
         <translation>ülikond</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1310"/>
         <source>cyl</source>
         <translation>ball</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1344"/>
+        <location filename="../qt-ui/models.cpp" line="1325"/>
         <source>location</source>
         <translation>asukoht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1316"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1338"/>
+        <location filename="../qt-ui/models.cpp" line="1319"/>
         <source>OTU</source>
         <translation>Hapnikumürgistuse ühik (OTU)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1341"/>
+        <location filename="../qt-ui/models.cpp" line="1322"/>
         <source>maxCNS</source>
         <translation>maxCNS</translation>
     </message>
@@ -721,115 +818,115 @@ palun eemalda need esmalt.</translation>
 <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>Vigane vastus serverilt</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>Oodatava XML märgendi  &apos;DiveDateReader&apos; asemel on &apos;%1&apos;</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>Oodatud XML märgendit &apos;DiveDates&apos; ei leitud</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>Vigane XML vastus. Rida %1: %2</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>Ühtegi sukeldumist pole valitud</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>zip-faili loomine üleslaadimiseks ebaõnnestus: %s</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>ei suuda luua ajutist faili: %s</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>sisemine viga: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="181"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="179"/>
         <source>internal error</source>
         <translation>sisemine viga</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>Valmis</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>Sukeldumiste listi üleslaadimine...</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>Sukeldumiste listi allalaadimine...</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>Laen alla %1 sukeldumist...</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>Allalaadimine lõppenud - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
         <source>Corrupted download</source>
         <translation>Vigane allalaadimine</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>Arhiivi ei saa avada:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Upload failed</source>
         <translation>Üleslaadimine ebaõnnestus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="849"/>
         <source>Upload successful</source>
         <translation>Üleslaadimine edukas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="854"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="852"/>
         <source>Login failed</source>
         <translation>Sisselogimine ebaõnnestus</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>Ei suuda vastust tuvastada</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="868"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Error: %1</source>
         <translation>Viga: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="835"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/>
         <source>Upload finished</source>
         <translation>Üleslaadimine lõppenud</translation>
     </message>
@@ -837,54 +934,54 @@ palun eemalda need esmalt.</translation>
 <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>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="165"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/>
         <source>Error</source>
         <translation>Viga</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>Korda</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>Leia Uemis sukeldumiskompuuter</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>Vali sukeldumiskompuutri allalaadimise logifail</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>Logifailid (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="339"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
         <source>Warning</source>
         <translation>Hoiatus</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>libdivecomputer tõmmisefaili salvestamine EI LAE sukeldumised sukeldumiste listi.</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>Vali sukeldumiskompuutri binaarformaadis tõmmisefail</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>Tõmmisefailid (*.bin)</translation>
     </message>
@@ -952,7 +1049,7 @@ palun eemalda need esmalt.</translation>
 <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>Toimeta valitud sukeldumiskohad</translation>
     </message>
@@ -961,848 +1058,854 @@ palun eemalda need esmalt.</translation>
     <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>Sukeldumise märkmed</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>Asukoht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="148"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Coordinates</source>
         <translation>Koordinaadid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="169"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="155"/>
+        <location filename="../qt-ui/maintab.ui" line="148"/>
         <source>Buddy</source>
         <translation>Semu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="63"/>
-        <source>Start time</source>
-        <translation>Algusaeg</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>Õhu temp</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>Vee temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="127"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Tags</source>
         <translation>Märgendid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="223"/>
         <source>Rating</source>
         <translation>Hinne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="236"/>
         <source>Visibility</source>
         <translation>Nähtavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="215"/>
+        <location filename="../qt-ui/maintab.ui" line="127"/>
         <source>Suit</source>
         <translation>Ülikond</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>Märkmed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="270"/>
+        <location filename="../qt-ui/maintab.ui" line="311"/>
         <source>Equipment</source>
         <translation>Varustus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="350"/>
+        <location filename="../qt-ui/maintab.ui" line="391"/>
         <source>Dive Info</source>
         <translation>Sukeldumise info</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>Kuupäev</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="414"/>
+        <location filename="../qt-ui/maintab.ui" line="275"/>
+        <source>Time</source>
+        <translation>Aeg</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="455"/>
         <source>Interval</source>
         <translation>Pinnaintervall</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="433"/>
+        <location filename="../qt-ui/maintab.ui" line="474"/>
         <source>Gases Used</source>
         <translation>Kasutatud gaas(id)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="452"/>
+        <location filename="../qt-ui/maintab.ui" line="493"/>
         <source>Gas Consumed</source>
         <translation>Tarbitud gaas</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>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="531"/>
         <source>Max. Depth</source>
         <translation>Max sügavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="509"/>
+        <location filename="../qt-ui/maintab.ui" line="550"/>
         <source>Ave. Depth</source>
         <translation>Keskm sügavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="528"/>
+        <location filename="../qt-ui/maintab.ui" line="569"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="547"/>
+        <location filename="../qt-ui/maintab.ui" line="588"/>
         <source>Air Pressure</source>
         <translation>Õhurõhk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="566"/>
+        <location filename="../qt-ui/maintab.ui" line="607"/>
         <source>Air Temperature</source>
         <translation>Õhu temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="585"/>
+        <location filename="../qt-ui/maintab.ui" line="626"/>
         <source>Water Temperature</source>
         <translation>Vee temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="604"/>
+        <location filename="../qt-ui/maintab.ui" line="645"/>
         <source>Dive Time</source>
         <translation>Põhjaaeg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="623"/>
+        <location filename="../qt-ui/maintab.ui" line="664"/>
         <source>Salinity</source>
         <translation>Soolsus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="660"/>
+        <location filename="../qt-ui/maintab.ui" line="701"/>
         <source>Stats</source>
         <translation>Statistika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="746"/>
         <source>Depth</source>
         <translation>Sügavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Temperature</source>
         <translation>Temperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="784"/>
         <source>Duration</source>
         <translation>Kestus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Total Time</source>
         <translation>Aeg kokku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="835"/>
         <source>Dives</source>
         <translation>Sukeldumisi kokku</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="919"/>
+        <source>Photos</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="89"/>
         <source>Cylinders</source>
         <translation>Balloonid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="90"/>
         <source>Add Cylinder</source>
         <translation>Lisa balloon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="93"/>
         <source>Weights</source>
         <translation>Raskused</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>Lisa raskuste süsteem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="438"/>
+        <location filename="../qt-ui/maintab.cpp" line="409"/>
         <source>Trip Location</source>
         <translation>Väljasõidu koht</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>Väljasõidu märkmed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="42"/>
+        <location filename="../qt-ui/maintab.cpp" line="48"/>
         <source>Save</source>
         <translation>Salvesta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="46"/>
+        <location filename="../qt-ui/maintab.cpp" line="52"/>
         <source>Cancel</source>
         <translation>Loobu</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>Õhu temp [%1]</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>Vee temp [%1]</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>Seda väljasõitu toimetatakse</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>Mitut sukeldumist toimetatakse</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>Seda sukeldumist toimetatakse.</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>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="494"/>
+        <location filename="../qt-ui/maintab.cpp" line="464"/>
         <source>unknown</source>
         <translation>tundmatu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>N</source>
-        <translation>N</translation>
+        <location filename="../qt-ui/maintab.cpp" line="501"/>
+        <source>Deepest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>S</source>
-        <translation>S</translation>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <source>Shallowest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>E</source>
-        <translation>E</translation>
+        <location filename="../qt-ui/maintab.cpp" line="794"/>
+        <source>Discard the Changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>W</source>
-        <translation>W</translation>
+        <location filename="../qt-ui/maintab.cpp" line="795"/>
+        <source>You are about to discard your changes.</source>
+        <translation type="unfinished"/>
     </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>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="571"/>
+        <location filename="../qt-ui/mainwindow.ui" line="646"/>
         <source>&amp;File</source>
         <translation>&amp;Fail</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="583"/>
+        <source>Print</source>
+        <translation>Väljastus</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:'Courier'; 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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
         <source>&amp;Log</source>
         <translation>&amp;Logi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="606"/>
+        <location filename="../qt-ui/mainwindow.ui" line="679"/>
         <source>&amp;View</source>
         <translation>&amp;Vaade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="628"/>
+        <location filename="../qt-ui/mainwindow.ui" line="701"/>
         <source>&amp;Help</source>
         <translation>&amp;Abi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="636"/>
+        <location filename="../qt-ui/mainwindow.ui" line="709"/>
         <source>&amp;Import</source>
         <translation>&amp;Import</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>&amp;Uus logiraamat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="655"/>
+        <location filename="../qt-ui/mainwindow.ui" line="728"/>
         <source>New</source>
         <translation>Uus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="658"/>
+        <location filename="../qt-ui/mainwindow.ui" line="731"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</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>&amp;Ava logiraamat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="666"/>
+        <location filename="../qt-ui/mainwindow.ui" line="739"/>
         <source>Open</source>
         <translation>Ava</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <location filename="../qt-ui/mainwindow.ui" line="742"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="674"/>
+        <location filename="../qt-ui/mainwindow.ui" line="747"/>
         <source>&amp;Save</source>
         <translation>&amp;Salvesta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="677"/>
+        <location filename="../qt-ui/mainwindow.ui" line="750"/>
         <source>Save</source>
         <translation>Salvesta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="680"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>Save as</source>
         <translation>Salvesta nimega</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>Ctrl+Shift+S</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>&amp;Sulge</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Close</source>
         <translation>Sulge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="702"/>
+        <location filename="../qt-ui/mainwindow.ui" line="775"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="902"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <source>P&amp;references</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="831"/>
+        <source>&amp;Add Dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <source>Auto &amp;Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="863"/>
+        <source>&amp;Dive List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="871"/>
+        <source>&amp;Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="879"/>
+        <source>&amp;Info</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="887"/>
+        <source>&amp;All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="895"/>
+        <source>P&amp;rev DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="903"/>
+        <source>&amp;Next DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="911"/>
+        <source>&amp;Select Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <source>&amp;About Subsurface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="937"/>
+        <source>&amp;Globe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="953"/>
+        <source>&amp;Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="959"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="707"/>
-        <source>Export &amp;UDDF</source>
-        <translation>Eksport &amp;UDDF</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="1008"/>
+        <source>&amp;Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1011"/>
+        <source>Export Dive Logs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1014"/>
+        <source>Ctrl+E</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Enable the pN2 Graph</source>
         <translation>Luba pN2 graaf</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <location filename="../qt-ui/mainwindow.ui" line="128"/>
         <source>Enable the pHe graph</source>
         <translation>Luba pHe graaf</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <location filename="../qt-ui/mainwindow.ui" line="290"/>
         <source>Show/hide heart rate</source>
         <translation>Näita/peida pulss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <location filename="../qt-ui/mainwindow.ui" line="342"/>
         <source>Enable EAD, END, and EADD</source>
         <translation>Luba EAD, END, and EADD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="238"/>
         <source>Show NDL / TTS</source>
         <translation>Näita NDL / TTS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="456"/>
+        <location filename="../qt-ui/mainwindow.ui" line="394"/>
         <source>Rescale depth axis</source>
         <translation>Skaleeri sügavuse telg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="710"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="715"/>
-        <source>Export HTML World Map</source>
-        <translation>Ekspordi HTML maailmakaart</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="718"/>
-        <source>Ctrl+H</source>
-        <translation>Ctrl+H</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="723"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>&amp;Print</source>
         <translation>&amp;Väljastus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="734"/>
+        <location filename="../qt-ui/mainwindow.ui" line="791"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="742"/>
+        <location filename="../qt-ui/mainwindow.ui" line="799"/>
         <source>&amp;Quit</source>
         <translation>&amp;Välju</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="753"/>
+        <location filename="../qt-ui/mainwindow.ui" line="810"/>
         <source>Import from &amp;dive computer</source>
         <translation>Impordi &amp;sukeldumiskompuutrist</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="818"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation>Impordi &amp;GPS andmed Subsurface teenusest</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="764"/>
+        <location filename="../qt-ui/mainwindow.ui" line="821"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="826"/>
         <source>&amp;Edit Device Names</source>
         <translation>&amp;Toimeta seadmete nimesid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="834"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="782"/>
+        <location filename="../qt-ui/mainwindow.ui" line="839"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Nummerda ümber</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="785"/>
+        <location filename="../qt-ui/mainwindow.ui" line="842"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="798"/>
+        <location filename="../qt-ui/mainwindow.ui" line="855"/>
         <source>&amp;Yearly Statistics</source>
         <translation>Statistika &amp;aastate kaupa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="801"/>
+        <location filename="../qt-ui/mainwindow.ui" line="858"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="806"/>
-        <source>Dive List</source>
-        <translation>Sukeldumiste list</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="814"/>
-        <source>Profile</source>
-        <translation>Profiil</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="822"/>
-        <source>Info</source>
-        <translation>Info</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="830"/>
-        <source>All</source>
-        <translation>Kõik</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="872"/>
+        <location filename="../qt-ui/mainwindow.ui" line="929"/>
         <source>User &amp;Manual</source>
         <translation>&amp;Kasutusjuhend</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="880"/>
-        <source>Globe</source>
-        <translation>Maakera</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="888"/>
+        <location filename="../qt-ui/mainwindow.ui" line="945"/>
         <source>P&amp;lan Dive</source>
         <translation>P&amp;laneeri sukeldumine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="891"/>
+        <location filename="../qt-ui/mainwindow.ui" line="948"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="907"/>
-        <source>Import from Divelogs.de</source>
-        <translation>Import Divelogs.de-st</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1003"/>
         <source>&amp;Check for Updates</source>
         <translation>&amp;Kontrolli kas on uuendusi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="951"/>
-        <source>Export CSV</source>
-        <translation>Ekspordi CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="726"/>
+        <location filename="../qt-ui/mainwindow.ui" line="783"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</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>Luba pO2 graaf</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>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="316"/>
         <source>Enable MOD</source>
         <translation>Luba MOD</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>Näita sukeldumiskompuutri poolt teatatud lagi</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>Näita arvutatud lagi</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>Näita arvutatud lagi 3m sammuga</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>Arvuta kõik koed</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>Näita SAC määra</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>Luba / keela mõõtühikute riba</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="731"/>
-        <source>Preferences</source>
-        <translation>Eelistused</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="745"/>
+        <location filename="../qt-ui/mainwindow.ui" line="802"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="756"/>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="774"/>
-        <source>Add Dive</source>
-        <translation>Lisa sukeldumine</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="793"/>
-        <source>Auto Group</source>
-        <translation>Autogrupeerimine</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="809"/>
+        <location filename="../qt-ui/mainwindow.ui" line="866"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="817"/>
+        <location filename="../qt-ui/mainwindow.ui" line="874"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <location filename="../qt-ui/mainwindow.ui" line="882"/>
         <source>Ctrl+4</source>
         <translation>CTRL+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="833"/>
+        <location filename="../qt-ui/mainwindow.ui" line="890"/>
         <source>Ctrl+1</source>
         <translation>CTRL+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="838"/>
-        <source>Prev DC</source>
-        <translation>Eelmine kompuuter</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="841"/>
+        <location filename="../qt-ui/mainwindow.ui" line="898"/>
         <source>Left</source>
         <translation>Vasak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="846"/>
-        <source>Next DC</source>
-        <translation>Uus kompuuter</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="849"/>
+        <location filename="../qt-ui/mainwindow.ui" line="906"/>
         <source>Right</source>
         <translation>Parem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="854"/>
-        <source>Select Events</source>
-        <translation>Vali sündmused</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <location filename="../qt-ui/mainwindow.ui" line="916"/>
         <source>Input Plan</source>
         <translation>Sisesta plaan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="864"/>
-        <source>About Subsurface</source>
-        <translation>Subsurface kohta</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="875"/>
+        <location filename="../qt-ui/mainwindow.ui" line="932"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="883"/>
+        <location filename="../qt-ui/mainwindow.ui" line="940"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="896"/>
-        <source>Import Log Files</source>
-        <translation>Impordi logifailid</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="899"/>
+        <location filename="../qt-ui/mainwindow.ui" line="956"/>
         <source>Import divelog files from other applications</source>
         <translation>Impordi sukeldumislogi failid teistest rakendustest</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="915"/>
+        <location filename="../qt-ui/mainwindow.ui" line="964"/>
+        <source>Import &amp;from Divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="972"/>
         <source>&amp;Full Screen</source>
         <translation>&amp;Täisekraan</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>Lülita täisekraan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <location filename="../qt-ui/mainwindow.ui" line="978"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="174"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
         <source>Open File</source>
         <translation>Ava fail</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>Enne faili sulgemist salvesta või katkesta käesoleva sukeldumise toimetamine.</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>
-        <translation>Enne sukeldumise planeerimist salvesta või katkesta käesoleva sukeldumise toimetamine.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="396"/>
+        <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>Enne sukeldumise lisamist salvesta või katkesta käesoleva sukeldumise toimetamine.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="645"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="419"/>
+        <source>Print runtime table</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="710"/>
         <source>Do you want to save the changes you made in the file %1?</source>
         <translation>Soovid tehtud muudatused salvestada faili %1?</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>Soovid tehtud muudatused salvestada andmefaili?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="652"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="717"/>
         <source>Save Changes?</source>
         <translation>Salvesta muudatused?</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>Muudatusi lähevad kaotsi kui neid ei salvestata.</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>Salvesta nimega</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>Hoiatus</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>Enne uue faili avamist salvesta või katkesta käesoleva sukeldumise toimetamine.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="280"/>
-        <source>Export UDDF File as</source>
-        <translation>Ekspordi UDDF fail kujul</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="281"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>UDDF failid (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="289"/>
-        <source>Export CSV File as</source>
-        <translation>Ekspordi CSV fail kujul</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="290"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>CSV failid (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="299"/>
-        <source>Export World Map</source>
-        <translation>Ekspordi maailmakaart</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="300"/>
-        <source>HTML files (*.html)</source>
-        <translation>HTML failid (*.html)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="449"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="514"/>
         <source>Yearly Statistics</source>
         <translation>Aasta statistika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="961"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1076"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1199"/>
         <source>Open Dive Log File</source>
         <translation>Ava sukeldumiste logi fail</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <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>Logifailid (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML failid (*.xml);;UDDF/UDCF failid (*.uddf *.udcf);;JDiveLog Files(*.jlb);;Suunto failid (*.sde *.db);;CSV failid (*.csv);;Kõik failid (*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1225"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Lõpeta praegune toimetamine enne järgmise alustamist.</translation>
     </message>
 </context>
 <context>
+    <name>PlannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Last stop at 20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="416"/>
+        <source>Last stop at 6m</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>PreferencesDialog</name>
     <message>
         <location filename="../qt-ui/preferences.ui" line="85"/>
@@ -1825,247 +1928,297 @@ palun eemalda need esmalt.</translation>
         <translation>Keel</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="151"/>
         <source>Lists and Tables</source>
         <translation>Listid ja tabelid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="167"/>
         <source>Font size</source>
         <translation>Fondi suurus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="170"/>
+        <location filename="../qt-ui/preferences.ui" line="180"/>
         <source>Dives</source>
         <translation>Sukeldumised</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>Sukeldumiste vaikefail</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="188"/>
+        <location filename="../qt-ui/preferences.ui" line="198"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="197"/>
+        <location filename="../qt-ui/preferences.ui" line="207"/>
         <source>Display Invalid</source>
         <translation>Kuva ebaõnnestunud</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="214"/>
+        <location filename="../qt-ui/preferences.ui" line="224"/>
         <source>Default Cylinder</source>
         <translation>Vaikimisi balloon</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>Kasuta vaikimisi ballooni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <location filename="../qt-ui/preferences.ui" line="247"/>
         <source>Animations</source>
         <translation>Animatsioonid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <location filename="../qt-ui/preferences.ui" line="253"/>
         <source>Speed</source>
         <translation>Kiirus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="270"/>
+        <location filename="../qt-ui/preferences.ui" line="280"/>
         <source>Subsurface Webservice</source>
         <translation>Subsurface veebiteenus</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>Vaikimisi kasutaja ID</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>Salvesta kasutaja ID lokaalselt?</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="312"/>
+        <source>Reset all settings to their default value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
         <source>System</source>
         <translation>Süsteem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="348"/>
         <source>Metric</source>
         <translation>SI</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="333"/>
+        <location filename="../qt-ui/preferences.ui" line="358"/>
         <source>Imperial</source>
         <translation>Briti/Ameerika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="343"/>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
         <source>Personalize</source>
         <translation>Isikupärasta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="392"/>
         <source>Depth</source>
         <translation>Sügavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="374"/>
+        <location filename="../qt-ui/preferences.ui" line="399"/>
         <source>meter</source>
         <translation>meeter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="409"/>
         <source>feet</source>
         <translation>jalg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="401"/>
+        <location filename="../qt-ui/preferences.ui" line="426"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="411"/>
+        <location filename="../qt-ui/preferences.ui" line="436"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="428"/>
+        <location filename="../qt-ui/preferences.ui" line="453"/>
         <source>liter</source>
         <translation>liiter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="438"/>
+        <location filename="../qt-ui/preferences.ui" line="463"/>
         <source>cu ft</source>
         <translation>kuupjalg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="455"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="465"/>
+        <location filename="../qt-ui/preferences.ui" line="490"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="482"/>
+        <location filename="../qt-ui/preferences.ui" line="507"/>
         <source>kg</source>
         <translation>kg</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>lävi pO₂ kuvamisel</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>lävi pN₂ kuvamisel</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>lävi pHe kuvamisel</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="636"/>
-        <source>max ppO₂ when showing MOD</source>
-        <translation>max ppO₂ kui kuvatakse MOD</translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="811"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="817"/>
+        <source>Proxy type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="830"/>
+        <source>Host</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="856"/>
+        <source>Port</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="882"/>
+        <source>Requires authentication</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="657"/>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="925"/>
+        <source>Password</source>
+        <translation>Salasõna</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="682"/>
         <source>draw dive computer reported ceiling red</source>
         <translation>kuva sukeldumiskompuutri esitatud lagi punasega</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="747"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>System Default</source>
         <translation>Süsteemi vaikeväärtus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="767"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="419"/>
         <source>Pressure</source>
         <translation>Rõhk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="421"/>
+        <location filename="../qt-ui/preferences.ui" line="446"/>
         <source>Volume</source>
         <translation>Maht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="448"/>
+        <location filename="../qt-ui/preferences.ui" line="473"/>
         <source>Temperature</source>
         <translation>Temperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="475"/>
+        <location filename="../qt-ui/preferences.ui" line="500"/>
         <source>Weight</source>
         <translation>Raskus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="517"/>
         <source>lbs</source>
         <translation>nael</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="507"/>
+        <location filename="../qt-ui/preferences.ui" line="532"/>
         <source>Time units</source>
         <translation>Ajaühikud</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>Laskumise/Tõusu kiiruse kordaja</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="520"/>
+        <location filename="../qt-ui/preferences.ui" line="545"/>
         <source>Minutes</source>
         <translation>Minutid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="530"/>
+        <location filename="../qt-ui/preferences.ui" line="555"/>
         <source>Seconds</source>
         <translation>Sekundid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="562"/>
+        <location filename="../qt-ui/preferences.ui" line="587"/>
         <source>Show</source>
         <translation>Näita</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="693"/>
         <source>Show non-used cylinders in Equipment Tab</source>
         <translation>Näita kasutamata balloone varustuse sakis</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>näita keskmine sügavus</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>GFlow max sügavusel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="691"/>
+        <location filename="../qt-ui/preferences.ui" line="716"/>
         <source>Misc</source>
         <translation>Muu</translation>
     </message>
@@ -2075,35 +2228,65 @@ palun eemalda need esmalt.</translation>
         <translation>Eelistused</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="697"/>
+        <location filename="../qt-ui/preferences.ui" line="722"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="739"/>
         <source>GFHigh</source>
         <translation>GFHigh</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="24"/>
+        <source>System proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="25"/>
+        <source>HTTP proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="26"/>
+        <source>SOCKS proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="245"/>
         <source>Restart required</source>
         <translation>Nõutav taaskäivitus</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>Uue keele kasutuselevõtuks tuleb Subsurface taaskäivitada.</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>Ava vaike logifail</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>Subsurface XML failid (*.ssrf *.xml *.XML)</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="394"/>
+        <source>Warning</source>
+        <translation>Hoiatus</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"/>
+    </message>
 </context>
 <context>
     <name>PrintDialog</name>
@@ -2244,72 +2427,72 @@ palun eemalda need esmalt.</translation>
 <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>tundmatu</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>Sukeldumine #%1 - %2</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>Max sügavus: %1 %2</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>Kestus: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1918"/>
+        <location filename="../qt-ui/models.cpp" line="1898"/>
         <source>Gas Used:</source>
         <translation>Kasutatud gaas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1920"/>
+        <location filename="../qt-ui/models.cpp" line="1900"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1922"/>
+        <location filename="../qt-ui/models.cpp" line="1902"/>
         <source>Max. CNS:</source>
         <translation>Max CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1924"/>
+        <location filename="../qt-ui/models.cpp" line="1904"/>
         <source>Weights:</source>
         <translation>Raskused:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1929"/>
+        <location filename="../qt-ui/models.cpp" line="1909"/>
         <source>Notes:</source>
         <translation>Märkmed:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1936"/>
+        <location filename="../qt-ui/models.cpp" line="1916"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1938"/>
+        <location filename="../qt-ui/models.cpp" line="1918"/>
         <source>Buddy:</source>
         <translation>Semu:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1940"/>
+        <location filename="../qt-ui/models.cpp" line="1920"/>
         <source>Suit:</source>
         <translation>Ülikond:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1942"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>Viz:</source>
         <translation>Nähtavus:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1944"/>
+        <location filename="../qt-ui/models.cpp" line="1924"/>
         <source>Rating:</source>
         <translation>Hinne:</translation>
     </message>
@@ -2317,62 +2500,77 @@ palun eemalda need esmalt.</translation>
 <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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/>
+        <source>Make first divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="906"/>
+        <source>Delete this divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="913"/>
         <source>Add Gas Change</source>
         <translation>Lisa gaasivahetus</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>Lisa järjehoidja</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>Eemalda sündmus</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>Peida sarnased sündmused</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>Toimeta nimi</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>Peida kõik sündmused</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>Peida sündmused</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>Peida kõik %1 sündmust?</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>Eemalda valitud sündmus?</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>%1 @ %2:%3</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>Toimeta järjehoidja nimi</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>Kohandatud nimi</translation>
     </message>
@@ -2380,12 +2578,12 @@ palun eemalda need esmalt.</translation>
 <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>ÕHK</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>Eemalda see punkt</translation>
     </message>
@@ -2395,22 +2593,22 @@ palun eemalda need esmalt.</translation>
         <translation>Sulge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="34"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation>Keskmine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="37"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation>Miinimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="40"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation>Maksimum</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>Liigu kaardil soovitud kohta ja märgi topeltklikiga sukeldumiskoht</translation>
     </message>
@@ -2424,9 +2622,23 @@ palun eemalda need esmalt.</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="128"/>
         <source>New starting number</source>
         <translation>Uus algusnumber</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="126"/>
+        <source>New number</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchBar</name>
+    <message>
+        <location filename="../qt-ui/searchbar.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ShiftImageTimesDialog</name>
@@ -2441,42 +2653,47 @@ palun eemalda need esmalt.</translation>
         <translation>Nihuta pildi (piltide) aegu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="102"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="95"/>
+        <source>h:mm</source>
+        <translation>t:mm</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="105"/>
         <source>earlier</source>
         <translation>varasem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="109"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="112"/>
         <source>later</source>
         <translation>hilisem</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>Sukeldumiskompuutri ja kaamera kellade näidu vahe arvutamiseks pildista kompuutri kellaajaga ekraani. Lae see pilt arvutisse ja vajuta sellele klahvikle.</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>Määra kaamera kellaaja nihe</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>Vali pilt sukeldumiskompuutri ajaga</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>Mis kuupäev ja kellaaeg on pildil?</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>Ava pildifail</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>Pildifailid (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2556,42 +2773,42 @@ palun eemalda need esmalt.</translation>
 <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>Veebiteenus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/>
         <source>Connecting...</source>
         <translation>Ühendab...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="421"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="419"/>
         <source>Download finished</source>
         <translation>Allalaadimine lõppenud</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>Allalaadimise viga: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/>
         <source>Connection Error: </source>
         <translation>Viga ühendamisel:</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>Vale kasutaja ID!</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>Ei suuda vastust tuvastada</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/>
         <source>Download Success!</source>
         <translation>Allalaadimine õnnestus!</translation>
     </message>
@@ -2607,17 +2824,17 @@ palun eemalda need esmalt.</translation>
 <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>Kirjeldus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2625,7 +2842,7 @@ palun eemalda need esmalt.</translation>
 <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>Info</translation>
     </message>
@@ -2633,42 +2850,42 @@ palun eemalda need esmalt.</translation>
 <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>Kontrolli kas on uuendusi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="37"/>
-        <source>&lt;h3&gt;Subsurface was unable to check for updates.&lt;/h3&gt;</source>
-        <translation>&lt;h3&gt;Subsurface ei suutnud kontrollida kas on uuendusi.&lt;/h3&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="36"/>
+        <source>Subsurface was unable to check for updates.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
-        <source>&lt;br/&gt;&lt;b&gt;The following error occurred:&lt;/b&gt;&lt;br/&gt;</source>
-        <translation>&lt;br/&gt;&lt;b&gt;Tekkis järgmine viga:&lt;/b&gt;&lt;br/&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="41"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="43"/>
-        <source>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Please check your internet connection.&lt;/b&gt;</source>
-        <translation>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Kontrolli internetiühendust.&lt;/b&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
     </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>Kasutad Subsurface kõige uuemat versiooni.</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>Subsurface uus versioon on väljas.&lt;br/&gt;Kliki:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; selle allalaadimiseks.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="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>&lt;b&gt;Subsurface uus versioon on ilmunud.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</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>Uuenduste olemasolu kontrolli viga.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -2676,25 +2893,163 @@ palun eemalda need esmalt.</translation>
 <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>Kasutusjuhend</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>Ei leia Subsurface juhendit</translation>
     </message>
 </context>
 <context>
+    <name>UserSurvey</name>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="47"/>
+        <source>Subsurface User Survey</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="79"/>
+        <source>Recreational DIver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="92"/>
+        <source>Tech Diver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="105"/>
+        <source>Interested in dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="118"/>
+        <source>I am downloading dives from supported dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="131"/>
+        <source>I am importing dives from other software / sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="144"/>
+        <source>I am manually entering dives</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="190"/>
+        <source>Please type suggestions (in English) in the following box</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="27"/>
+        <source>
+Operating System: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="30"/>
+        <source>
+CPU Architecture: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="35"/>
+        <source>
+OS CPU Architecture %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="39"/>
+        <source>
+Language: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="73"/>
+        <source>Should we ask you later?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="74"/>
+        <source>Don&apos;t ask me again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="75"/>
+        <source>Ask Later</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="76"/>
+        <source>Ask again?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <source>Submit User Survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <source>Subsurface was unable to submit the user survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="101"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="102"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="111"/>
+        <source>Survey successfully submitted.</source>
+        <translation type="unfinished"/>
+    </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>Uuenduste olemasolu kontrolli viga.&lt;br/&gt;&lt;br/&gt;%1</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>Kirjeldus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="723"/>
+        <location filename="../qt-ui/models.cpp" line="721"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2742,12 +3097,12 @@ palun eemalda need esmalt.</translation>
         <translation>Üleslaadimine</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>Toiming aegus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="279"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="277"/>
         <source>Transfering data...</source>
         <translation>Andmete ülekanne...</translation>
     </message>
@@ -2755,37 +3110,37 @@ palun eemalda need esmalt.</translation>
 <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>Tüüp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="368"/>
+        <location filename="../qt-ui/models.cpp" line="373"/>
         <source>Weight</source>
         <translation>Raskus</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>Siin klikkamine kõrvaldab selle raskuste süsteemi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="453"/>
+        <location filename="../qt-ui/models.cpp" line="458"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="454"/>
+        <location filename="../qt-ui/models.cpp" line="459"/>
         <source>lbs</source>
         <translation>nael</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="478"/>
+        <location filename="../qt-ui/models.cpp" line="483"/>
         <source>ft</source>
         <translation>jalg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="484"/>
         <source>m</source>
         <translation>m</translation>
     </message>
@@ -2793,79 +3148,79 @@ palun eemalda need esmalt.</translation>
 <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>Aasta
  &gt; Kuu / väljasõit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1643"/>
         <source>Duration 
  Total</source>
         <translation>Kestus
 kokku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>
 Average</source>
         <translation>
 Keskmine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>
 Shortest</source>
         <translation>
 Lühim</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>
 Longest</source>
         <translation>
 Pikim</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>Sügavus (%1)
 keskmine</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>
 Miinimum</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>
 Maksimum</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>SAC (%1)
  keskmine</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>Temp. (%1)
@@ -2875,99 +3230,92 @@ Maksimum</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="58"/>
+        <location filename="../dive.c" line="87"/>
         <source>pascal</source>
         <translation>paskal</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>bar</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>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="104"/>
-        <location filename="../qt-gui.cpp" line="292"/>
-        <source>l</source>
-        <translation>l</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>kuupjalg</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>m</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>jalg</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>nael</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>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1120"/>
+        <location filename="../dive.c" line="1237"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) või (%s)</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>õhk</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="170"/>
+        <location filename="../equipment.c" line="210"/>
         <source>integrated</source>
         <translation>integreeritud</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="171"/>
+        <location filename="../equipment.c" line="211"/>
         <source>belt</source>
         <translation>vöö</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="172"/>
+        <location filename="../equipment.c" line="212"/>
         <source>ankle</source>
         <translation>pahkluu</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="173"/>
+        <location filename="../equipment.c" line="213"/>
         <source>backplate weight</source>
         <translation>seljaplaadi kaal</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="174"/>
+        <location filename="../equipment.c" line="214"/>
         <source>clip-on</source>
         <translation>külgeriputatav</translation>
     </message>
@@ -2984,253 +3332,253 @@ Maksimum</translation>
         <translation>CSV impordil on max toetatud veergude arv %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>none</source>
         <translation>mitte ükski</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>deco stop</source>
         <translation>dekopeatus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ascent</source>
         <translation>tõus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ceiling</source>
         <translation>lagi</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>workload</source>
         <translation>töökoormus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>transmitter</source>
         <translation>saatja</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>violation</source>
         <translation>rikkumine</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>bookmark</source>
         <translation>järjehoidja</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>surface</source>
         <translation>pind</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>safety stop</source>
         <translation>ohutuspeatus</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>gaasivahetus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (voluntary)</source>
         <translation>ohutuspeatus (vabatahtlik)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (mandatory)</source>
         <translation>ohutuspeatus (kohustuslik)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>deepstop</source>
         <translation>sügavpeatus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>ceiling (safety stop)</source>
         <translation>lagi (ohutuspeatus)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>divetime</source>
         <translation>põhjaaeg</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>allpool taset</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>maxdepth</source>
         <translation>max sügavus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>OLF</source>
         <translation>Hapnikulimiidi osa (OLF)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>airtime</source>
         <translation>aeg õhuga</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>heading</source>
         <translation>suund</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>tissue level warning</source>
         <translation>koe taseme hoiatus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>non stop time</source>
         <translation>mittepeatuste aeg</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="163"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>invalid event number</source>
         <translation>vale sündmuse nr</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>Ei saa luua parserit %s %s jaoks</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="411"/>
+        <location filename="../libdivecomputer.c" line="414"/>
         <source>Error registering the data</source>
         <translation>Viga andmete registreerimisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="419"/>
+        <location filename="../libdivecomputer.c" line="422"/>
         <source>Error parsing the datetime</source>
         <translation>Viga kuupäeva ja aja tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="438"/>
         <source>Dive %d: %s %d %04d</source>
         <translation>Sukeldumine %d: %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="440"/>
+        <location filename="../libdivecomputer.c" line="443"/>
         <source>Error parsing the divetime</source>
         <translation>Viga põhjaaja tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="449"/>
+        <location filename="../libdivecomputer.c" line="452"/>
         <source>Error parsing the maxdepth</source>
         <translation>Viga max sügavuse tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="458"/>
+        <location filename="../libdivecomputer.c" line="461"/>
         <source>Error parsing the gas mix count</source>
         <translation>Viga gaasisegude arvu tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="470"/>
+        <location filename="../libdivecomputer.c" line="473"/>
         <source>Error obtaining water salinity</source>
         <translation>Viga vee soolsuse saamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error obtaining surface pressure</source>
         <translation>Viga pinnarõhu saamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the gas mix</source>
         <translation>Viga gaasisegu tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="493"/>
+        <location filename="../libdivecomputer.c" line="496"/>
         <source>Error parsing the samples</source>
         <translation>Viga proovide tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="623"/>
+        <location filename="../libdivecomputer.c" line="626"/>
         <source>Event: waiting for user action</source>
         <translation>Sündmus: ootan kasutaja sekkumist</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>mudel=%u (0x%08x), püsivara=%u (0x%08x), seerianr=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="691"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the event handler.</source>
         <translation>Viga sündmuste draiveri registreerimisel.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="696"/>
+        <location filename="../libdivecomputer.c" line="699"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Viga tühistamise draiveri registreerimisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="717"/>
+        <location filename="../libdivecomputer.c" line="720"/>
         <source>Dive data import error</source>
         <translation>Viga sukeldumise andmete impordil</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="756"/>
+        <location filename="../libdivecomputer.c" line="759"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Ei saa luua libdivecomputer konteksti</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="763"/>
+        <location filename="../libdivecomputer.c" line="766"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Ei saa avada %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="462"/>
+        <location filename="../parse-xml.c" line="466"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Imelik protsendilugem %s
 </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>&apos;%s&apos; tuvastamine ebaõnnestus</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>Andmebaasi päring get_events ebaõnnestus.
 </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>Andmebaasi päring get_tags ebaõnnestus.
@@ -3244,111 +3592,160 @@ Maksimum</translation>
 </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 '%s'.
 </source>
         <translation>Andmebaasi päring ebaõnnestus &apos;%s&apos;.
 </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>Andmebaasi päring get_cylinders ebaõnnestus.
 </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>Andmebaasi päring get_changes ebaõnnestus.
 </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>Andmebaasi päring get-profile_sample ebaõnnestus.
 </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>Ei suuda avada stiililehte &amp;s</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>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="146"/>
-        <location filename="../planner.c" line="617"/>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation>Ei leia gaasi %d/%d</translation>
+        <location filename="../planner.c" line="159"/>
+        <location filename="../planner.c" line="752"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="308"/>
+        <location filename="../planner.c" line="345"/>
         <source>Too many gas mixes</source>
         <translation>Liiga palju gaasisegusid</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="489"/>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation>%s
-Subsurface poolt arvutatud sukeldumisplaan
-põhineb väärtustel GFlow = %.0f ja GFhigh = %.0f
-
-</translation>
+        <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>TÄHELEPANU: SIIN ON KASUTUSEL BÜHLMANNI ALGORITMIL PÕHINEV SUKELDUMISTE PLANEERIJA, MIS ON NULLIST IMPLEMENTEERITUD JA SEDA ON HETKEL NAPILT KATSETATUD. SOOVITAME TUNGIVALT, MITTE PLANEERIDA OMA SUKELDUMIST AINULT SIIT SAADUD ANDMETE PÕHJAL.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="530"/>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Üleminek %.*f %s %d:%02d min jooksul - käitusaeg %d:%02u on %s
-</translation>
+        <location filename="../planner.c" line="535"/>
+        <source>based on GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="539"/>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Püsi %.*f %s peal %d:%02d min - jooksev aeg %d:%02u on %s
-</translation>
+        <location filename="../planner.c" line="538"/>
+        <source>Subsurface dive plan</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="550"/>
-        <source>Switch gas to %s
-</source>
-        <translation>Mine üle %s gaasile
-</translation>
+        <location filename="../planner.c" line="542"/>
+        <source>depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="558"/>
-        <source>Gas consumption:
-</source>
-        <translation>Gaasi tarbimine:
-</translation>
+        <location filename="../planner.c" line="545"/>
+        <source>runtime</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="569"/>
-        <source>%.0f%s of %s
-</source>
-        <translation>%.0f%s of %s
-</translation>
+        <location filename="../planner.c" line="548"/>
+        <source>duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="551"/>
+        <source>gas</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="606"/>
+        <source>%3.0f%s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
+        <source>%3dmin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="629"/>
+        <source>Switch gas to %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="638"/>
+        <source>Gas consumption:</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="659"/>
+        <source>this is more gas than available in the specified cylinder!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="810"/>
+        <location filename="../planner.c" line="664"/>
+        <source>not enough reserve for gas sharing on ascent!</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="668"/>
+        <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="980"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1226"/>
+        <location filename="../profile.c" line="1250"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3357,70 +3754,69 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1229"/>
+        <location filename="../profile.c" line="1253"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1233"/>
+        <location filename="../profile.c" line="1257"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1263"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </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>SAC: %2.1fl/min
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1244"/>
+        <location filename="../profile.c" line="1268"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1246"/>
+        <location filename="../profile.c" line="1270"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1272"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="1274"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="1277"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1260"/>
+        <location filename="../profile.c" line="1284"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3429,7 +3825,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1264"/>
+        <location filename="../profile.c" line="1288"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3438,397 +3834,390 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1276"/>
+        <location filename="../profile.c" line="1300"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Ohutuspeatus: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1279"/>
+        <location filename="../profile.c" line="1303"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Ohutuspeatus: teadmata aeg @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="1308"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
+        <location filename="../profile.c" line="1311"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deko: teadmata aeg @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1291"/>
+        <location filename="../profile.c" line="1315"/>
         <source>In deco
 </source>
         <translation>Dekos
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1293"/>
+        <location filename="../profile.c" line="1317"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1297"/>
+        <location filename="../profile.c" line="1321"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (arvutatud)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1305"/>
+        <location filename="../profile.c" line="1329"/>
         <source>In deco (calc)
 </source>
         <translation>Dekos (arvutatud)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1307"/>
+        <location filename="../profile.c" line="1331"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (arvutatud)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1310"/>
+        <location filename="../profile.c" line="1334"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (arvutatud)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1313"/>
+        <location filename="../profile.c" line="1337"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Arvutatud lagi %.0f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1319"/>
+        <location filename="../profile.c" line="1343"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Kude %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1325"/>
+        <location filename="../profile.c" line="1349"/>
         <source>heartbeat: %d
 </source>
         <translation>Pulss: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1327"/>
+        <location filename="../profile.c" line="1351"/>
         <source>bearing: %d
 </source>
         <translation>Kurss: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1419"/>
+        <location filename="../profile.c" line="1443"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</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>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1435"/>
+        <location filename="../profile.c" line="1459"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1439"/>
+        <location filename="../profile.c" line="1463"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</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>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1454"/>
+        <location filename="../profile.c" line="1478"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="273"/>
+        <location filename="../qt-gui.cpp" line="281"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="276"/>
+        <location filename="../qt-gui.cpp" line="284"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="392"/>
-        <source>%1, %2 %3, %4 %5:%6</source>
-        <translation>%1, %2 %3, %4 %5:%6</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="405"/>
-        <source>%1 %2, %3
-%4:%5</source>
-        <translation>%1 %2, %3
-%4:%5</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="418"/>
+        <location filename="../qt-gui.cpp" line="417"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 sukeldumist)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="423"/>
+        <location filename="../qt-gui.cpp" line="422"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 sukeldumine)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>boat</source>
         <translation>paat</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>shore</source>
         <translation>kallas</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>drift</source>
         <translation>hoovus</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>deep</source>
         <translation>sügav</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>cavern</source>
         <translation>õõs</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>ice</source>
         <translation>jää</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>wreck</source>
         <translation>vrakk</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>cave</source>
         <translation>koobas</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>altitude</source>
         <translation>kõrgus</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>pool</source>
         <translation>bassein</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>lake</source>
         <translation>järv</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>river</source>
         <translation>jõgi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>night</source>
         <translation>öö</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>fresh</source>
         <translation>magevesi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>student</source>
         <translation>õpilane</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>photo</source>
         <translation>foto</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>video</source>
         <translation>video</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>instructor</source>
         <translation>instruktor</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="25"/>
         <source>deco</source>
         <translation>deko</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="216"/>
+        <location filename="../dive.c" line="133"/>
+        <source>ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="214"/>
         <source>more than %d days</source>
         <translation>enam kui %d päeva</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="220"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="224"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dh %dmin</source>
         <translation>%dt %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="235"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation>sukeldumiste nr</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="242"/>
+        <location filename="../statistics.c" line="240"/>
         <source>for selected dives</source>
         <translation>valitud sukeldumiste</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="275"/>
         <source>for dive #%d</source>
         <translation>sukeldumise nr %d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for selected dive</source>
         <translation>valitud sukeldumise</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for all dives</source>
         <translation>kõikide sukeldumiste</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="283"/>
+        <location filename="../statistics.c" line="281"/>
         <source>(no dives)</source>
         <translation>(pole sukeldumisi)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sun</source>
         <translation>Pühap</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Mon</source>
         <translation>Esmasp</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Tue</source>
         <translation>Teisip</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Wed</source>
         <translation>Kolmap</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Thu</source>
         <translation>Neljap</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Fri</source>
         <translation>Reede</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sat</source>
         <translation>Laup</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jan</source>
         <translation>Jaan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Feb</source>
         <translation>Veebr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Mar</source>
         <translation>Märts</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jun</source>
         <translation>Juuni</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Jul</source>
         <translation>Juuli</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Sep</source>
         <translation>Sept</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Dec</source>
         <translation>Dets</translation>
     </message>
@@ -3857,97 +4246,97 @@ Is the Uemis Zurich plugged in correctly?</source>
 Kas Uemis Zurich on ühendatud korrektselt?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="107"/>
+        <location filename="../uemis-downloader.c" line="111"/>
         <source>unknown</source>
         <translation>tundmatu</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="379"/>
+        <location filename="../uemis-downloader.c" line="383"/>
         <source>Reading %s %s</source>
         <translation>Loen %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="399"/>
+        <location filename="../uemis-downloader.c" line="403"/>
         <source>data</source>
         <translation>andmed</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="420"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>divelog entry id</source>
         <translation>logi kirje ID</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="422"/>
+        <location filename="../uemis-downloader.c" line="426"/>
         <source>divespot data id</source>
         <translation>sukeldumiskoha andmete ID</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
+        <location filename="../uemis-downloader.c" line="428"/>
         <source>more data dive id</source>
         <translation>rohkem sukeldumisandmete ID</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>wetsuit</source>
         <translation>märgülikond</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>semidry</source>
         <translation>poolkuiv</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>drysuit</source>
         <translation>kuivülikond</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>shorty</source>
         <translation>lühike ülikond</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>vest</source>
         <translation>vest</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>long john</source>
         <translation>pikk john</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>jacket</source>
         <translation>vest</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>full suit</source>
         <translation>täisülikond</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>2 pcs full suit</source>
         <translation>2-osaline täisülikond</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="620"/>
+        <location filename="../uemis-downloader.c" line="624"/>
         <source>membrane</source>
         <translation>membraan</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="802"/>
+        <location filename="../uemis-downloader.c" line="823"/>
         <source>Init Communication</source>
         <translation>Algata ülekanne</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="804"/>
+        <location filename="../uemis-downloader.c" line="825"/>
         <source>Uemis init failed</source>
         <translation>Uemis alglaadimine ebaõnnestus</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="815"/>
+        <location filename="../uemis-downloader.c" line="836"/>
         <source>Start download</source>
         <translation>Alusta allalaadimist</translation>
     </message>
@@ -3968,18 +4357,18 @@ Kas Uemis Zurich on ühendatud korrektselt?</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="203"/>
-        <source>PO2 Green Warning</source>
-        <translation>PO2 roheline hoiatus</translation>
+        <source>pO₂ Green Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
-        <source>PO2 Ascend Warning</source>
-        <translation>PO2 tõusu hoiatus</translation>
+        <source>pO₂ Ascend Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="208"/>
-        <source>PO2 Ascend Alarm</source>
-        <translation>PO2 tõusu alarm</translation>
+        <source>pO₂ Ascend Alarm</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
@@ -4041,5 +4430,214 @@ Kas Uemis Zurich on ühendatud korrektselt?</translation>
         <source>Low Battery Alert</source>
         <translation>Patarei tühjenemise häire</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"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="36"/>
+        <source>Date:</source>
+        <translation>Kuupäev:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="38"/>
+        <source>Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="40"/>
+        <source>Duration:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="41"/>
+        <source>min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="43"/>
+        <source>Max Depth:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="46"/>
+        <source>Air Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="48"/>
+        <source>Water Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="50"/>
+        <source>Location:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="54"/>
+        <source>Notes:</source>
+        <translation>Märkmed:</translation>
+    </message>
+</context>
+<context>
+    <name>plannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="35"/>
+        <source>Rates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="56"/>
+        <source>Ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="77"/>
+        <source>below 75% avg. depth</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="94"/>
+        <source>75%-50% avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="111"/>
+        <source>50% avg. depth - 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="128"/>
+        <source>6m/20ft to surface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="148"/>
+        <source>Descent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="200"/>
+        <source>surface to the bottom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="226"/>
+        <source>Planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="247"/>
+        <source>GF low</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="264"/>
+        <source>GF high</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
+        <source>Drop to first depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
+        <source>Last Stop at 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>plan backgas breaks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="318"/>
+        <source>Gas Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <source>bottom SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="349"/>
+        <source>deco SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="359"/>
+        <source>bottom pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="389"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="382"/>
+        <source>deco pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="421"/>
+        <source>Dive Notes</source>
+        <translation>Sukeldumise märkmed</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="445"/>
+        <source>display runtime</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="458"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="461"/>
+        <source>display segment duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="471"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="474"/>
+        <source>display transitions in deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="481"/>
+        <source>verbatim diveplan</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_fi_FI.ts b/translations/subsurface_fi_FI.ts
index 4033dda8e..b7b4697f1 100644
--- a/translations/subsurface_fi_FI.ts
+++ b/translations/subsurface_fi_FI.ts
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="fi_FI" version="2.0">
+<defaultcodec>UTF-8</defaultcodec>
 <context>
     <name>CylindersModel</name>
     <message>
@@ -37,42 +38,42 @@
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="71"/>
+        <location filename="../qt-ui/models.cpp" line="70"/>
         <source>Switch at</source>
         <translation>Vaihda syvyydessä</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>Poista säiliö.</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>Säiliötä ei voida poistaa</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>Tämä kaasu on käytössä. Vain säiliöt, joita ei käytetä sukelluksella, voidaan poistaa.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="507"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="508"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="527"/>
+        <location filename="../qt-ui/models.cpp" line="532"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="528"/>
+        <location filename="../qt-ui/models.cpp" line="533"/>
         <source>cuft</source>
         <translation>ft³</translation>
     </message>
@@ -100,22 +101,22 @@ poistaa valitun sukellustietokoneen?</translation>
 <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>Malli</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Device ID</source>
         <translation>Laite ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Nickname</source>
         <translation>Lempinimi</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>Poista sukellustietokone.</translation>
     </message>
@@ -123,190 +124,326 @@ poistaa valitun sukellustietokoneen?</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="90"/>
-        <source>air</source>
-        <translation>ilma</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="92"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</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>Vaihto avoimeen ilman kiertoon</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>alku</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>loppu</translation>
     </message>
 </context>
 <context>
-    <name>DiveGasPressureItem</name>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="475"/>
-        <source>air</source>
-        <translation>ilma</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="476"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-</context>
-<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1258"/>
-        <source> l/min</source>
-        <translation>l/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
-        <source> cuft/min</source>
-        <translation>jalkaa/min</translation>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <source>/min</source>
+        <translation>/min</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>Näytä hakukenttä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="706"/>
         <source>expand all</source>
         <translation>laajenna kaikki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="740"/>
+        <location filename="../qt-ui/divelistview.cpp" line="707"/>
         <source>collapse all</source>
         <translation>supista kaikki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="741"/>
+        <location filename="../qt-ui/divelistview.cpp" line="708"/>
         <source>collapse others</source>
         <translation>supista muut</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>erota sukellukset retkestä</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>luo uusi retki yläpuolelle</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>lisää sukellukset yläpuoliseen retkeen</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>lisää sukellukset alapuoliseen retkeen</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>liitä retki yllä olevaan retkeen</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>liitä retki alla olevaan retkeen</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>poista sukellukset</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>Merkitse sukellukset epäkelvoiksi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
-        <source>save As</source>
-        <translation>tallenna nimellä</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="763"/>
-        <source>export As UDDF</source>
-        <translation>vie UDDF</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="764"/>
-        <source>export As CSV</source>
-        <translation>vie CSV</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="744"/>
+        <source>renumber dive(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="765"/>
+        <location filename="../qt-ui/divelistview.cpp" line="745"/>
         <source>shift times</source>
         <translation>muuta aikoja</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="766"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>load images</source>
         <translation>lataa kuvat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="769"/>
-        <source>upload dive(s) to divelogs.de</source>
-        <translation>lähetä sukellukset divelogs.de -sivustolle</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Open Image Files</source>
+        <translation>Avaa kuvatiedostot</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation>Kuvatiedostot (</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <source>merge selected dives</source>
+        <translation>yhdistä valitut sukellukset</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="24"/>
+        <source>General Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="30"/>
+        <source>Export format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="42"/>
+        <source>Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="61"/>
+        <source>UDDF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="74"/>
+        <source>divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="84"/>
+        <source>CSV</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="94"/>
+        <source>Worldmap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="107"/>
+        <source>Selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="116"/>
+        <source>Selected dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="126"/>
+        <source>All dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="178"/>
+        <source>HTML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="184"/>
+        <source>General Settings</source>
+        <translation>Yleisasetukset</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="190"/>
+        <source>Subsurface Numbers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="203"/>
+        <source>Selected Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="216"/>
+        <source>Minimum Javascript</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="229"/>
+        <source>All Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="239"/>
+        <source>Export List only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="252"/>
+        <source>Style Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="264"/>
+        <source>Font</source>
+        <translation>Fontti</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="274"/>
+        <source>Font size</source>
+        <translation>Fontin koko</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
+        <source>8</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <source>10</source>
+        <translation>10</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <source>12</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <source>14</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="795"/>
-        <source>Save Dives As...</source>
-        <translation>Tallenna sukellukset nimellä...</translation>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <source>16</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="814"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <source>18</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <source>20</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="323"/>
+        <source>Theme</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <source>Sand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="153"/>
         <source>Export UDDF File as</source>
         <translation>Vie UDDF tiedostoon</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>UDDF -tiedostot (*.uddf *.UDDF)</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>Vie CSV tiedostoon</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>CSV tiedostot (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Open Image Files</source>
-        <translation>Avaa kuvatiedostot</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="162"/>
+        <source>Export World Map</source>
+        <translation>Vie maailmankartta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
-        <translation>Kuvatiedostot (</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="163"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="177"/>
+        <source>HTML files (*.html)</source>
+        <translation>HTML -tiedostot (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="760"/>
-        <source>merge selected dives</source>
-        <translation>yhdistä valitut sukellukset</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="167"/>
+        <source>Export Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="168"/>
+        <source>XML files (*.xml *.ssrf)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="176"/>
+        <source>Export HTML files as</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -317,138 +454,133 @@ poistaa valitun sukellustietokoneen?</translation>
         <translation>Liitä sukellusloki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="36"/>
-        <source>Import CSV Dive Log Files</source>
-        <translation>Liitä CSV -muotoinen sukellusloki</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="50"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
         <source>CSV options</source>
         <translation>CSV -asetukset</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="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>Kentän erotin</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>Esiasetetut tuonnit</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>Kentän määritys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="80"/>
         <source>Depth</source>
         <translation>Syvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="100"/>
         <source>Stopdepth</source>
         <translation>Pysähdyssyvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="107"/>
         <source>PO2</source>
         <translation>PO2</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>Kello</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="121"/>
         <source>Temp</source>
         <translation>Lämpötila</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="151"/>
         <source>Cns</source>
         <translation>Cns</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>Yksiköt</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>Metrinen</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>Brittiläinen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="248"/>
         <source>Manual dives</source>
         <translation>Vapaa CSV -tiedostosta tuonti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="283"/>
         <source>Dive #</source>
         <translation>Sukellus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="317"/>
         <source>Date</source>
         <translation>Ajankohta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="385"/>
         <source>Duration</source>
         <translation>Kesto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="470"/>
         <source>Tags</source>
         <translation>Avainsanat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
         <source>Location</source>
         <translation>Kohde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="453"/>
         <source>Gps</source>
         <translation>Gps</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="300"/>
         <source>Max depth</source>
         <translation>Suurin syvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="334"/>
         <source>Mean depth</source>
         <translation>Keskisyvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="368"/>
         <source>Buddy</source>
         <translation>Sukelluspari</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="402"/>
         <source>Notes</source>
         <translation>Muistiinpanot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="436"/>
         <source>Weight</source>
         <translation>Painot</translation>
     </message>
@@ -456,105 +588,70 @@ poistaa valitun sukellustietokoneen?</translation>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="71"/>
-        <source>Bottom SAC</source>
-        <translation>Ilmankulutus pohjalla</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="106"/>
+        <source>Planned Dive Time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="85"/>
-        <source>SAC on DECO Stop</source>
-        <translation>Ilmankulutus deco-pysähdyksessä</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="134"/>
+        <source>Altitude</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="78"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="98"/>
-        <source>GFLow</source>
-        <translation>GFLow</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="125"/>
-        <source>Last Stop at 6m</source>
-        <translation>Viimeinen pysähdys kuudessa metrissä</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="174"/>
-        <source>Start Time</source>
-        <translation>Alkuaika</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="181"/>
+        <location filename="../qt-ui/diveplanner.ui" line="141"/>
         <source>ATM Pressure</source>
         <translation>Ilmanpaine</translation>
     </message>
-</context>
-<context>
-    <name>DivePlannerGraphics</name>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="114"/>
-        <source>10m</source>
-        <translation>10m</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="116"/>
-        <source>30ft</source>
-        <translation>30 jalkaa</translation>
-    </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="363"/>
-        <source>Handler Position Error</source>
-        <translation>Virhe</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="148"/>
+        <source>mbar</source>
+        <translation type="unfinished"/>
     </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>
-        <translation>Tämä toimenpide hävittää yhden tai useamman pysähdyksistäsi,
-poista ensin pysähdykset.</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="158"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="445"/>
-        <source>AIR</source>
-        <translation>Ilma</translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="137"/>
+        <source>unknown</source>
+        <translation>tuntematon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1148"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="586"/>
         <source>Final Depth</source>
         <translation>Lopullinen syvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1150"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="588"/>
         <source>Run time</source>
         <translation>Kesto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1152"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="590"/>
         <source>Duration</source>
         <translation>Kesto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1154"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="592"/>
         <source>Used Gas</source>
         <translation>Käytetty kaasuseos</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>CCR-asetuspiste</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>Hylätäänkö suunnitelma?</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>Olet hylkäämässä suunnitelmasi.</translation>
     </message>
@@ -562,17 +659,17 @@ poista ensin pysähdykset.</translation>
 <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>Sukellussuunnitelman etappipisteet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="256"/>
         <source>Available Gases</source>
         <translation>Mahdolliset kaasut</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>lisää sukellusetappi</translation>
     </message>
@@ -616,8 +713,23 @@ poista ensin pysähdykset.</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
-        <source>Pressure  S</source>
-        <translation>Sensoripaine</translation>
+        <source>Pressure S</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <source>pN₂</source>
+        <translation>pN₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>pHe</source>
+        <translation>pHe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
@@ -634,86 +746,71 @@ poista ensin pysähdykset.</translation>
         <source>SAC</source>
         <translation>Pintakulutus</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
-        <source>PN2</source>
-        <translation>PN2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
-        <source>PHE</source>
-        <translation>PHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
-        <source>PO2</source>
-        <translation>PO2</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>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>date</source>
         <translation>päiväys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1298"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>lbs</source>
         <translation>pauna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
+        <location filename="../qt-ui/models.cpp" line="1307"/>
         <source>suit</source>
         <translation>puku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1310"/>
         <source>cyl</source>
         <translation>säiliöt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1344"/>
+        <location filename="../qt-ui/models.cpp" line="1325"/>
         <source>location</source>
         <translation>kohde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1316"/>
         <source>SAC</source>
         <translation>Pintakulutus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1338"/>
+        <location filename="../qt-ui/models.cpp" line="1319"/>
         <source>OTU</source>
         <translation>Happikertymä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1341"/>
+        <location filename="../qt-ui/models.cpp" line="1322"/>
         <source>maxCNS</source>
         <translation>maxCNS</translation>
     </message>
@@ -721,115 +818,115 @@ poista ensin pysähdykset.</translation>
 <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>Virheellinen vastaus palvelimelta</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>Odotettu XML tägi on &apos;DiveDateReader&apos;, mutta saatiin &apos;%1&apos;</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>Odotettua XML -tägiä &apos;DiveDates&apos; ei löydy</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>Virheellinen XML vastasu. Rivi %1: %2</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>sukelluksia ei ole valittu</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>zip -tiedoston luonti vientiä varten epäonnistui: %s</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>väliaikaistiedoston luominen ei onnistu: %s</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>sisäinen virhe: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="181"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="179"/>
         <source>internal error</source>
         <translation>sisäinen virhe</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>Valmis</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>Lähetetään sukelluslokia...</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>Ladataan sukelluslokia...</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>Ladataan %1 sukellusta...</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>Lataus päättynyt - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
         <source>Corrupted download</source>
         <translation>Lataus on korruptoitunut</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>Pakattua tiedostoa ei voitu avata:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Upload failed</source>
         <translation>Lähetys epäonnistui</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="849"/>
         <source>Upload successful</source>
         <translation>Lähetys onnistui</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="854"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="852"/>
         <source>Login failed</source>
         <translation>Kirjautuminen epäonnistui</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>Vastauksen jäsentäminen ei onnistu!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="868"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Error: %1</source>
         <translation>Virhe: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="835"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/>
         <source>Upload finished</source>
         <translation>Lähetys valmistui</translation>
     </message>
@@ -837,54 +934,54 @@ poista ensin pysähdykset.</translation>
 <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>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="165"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/>
         <source>Error</source>
         <translation>Virhe</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>Yritä uudestaan</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>Etsi Uemis -sukellustietokone</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>Valitse lokitiedosto sukellustietokoneen purun tietojen tallennukseen</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>Lokitiedostot (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="339"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
         <source>Warning</source>
         <translation>Varoitus</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>Kun sukellustietokoneen latauksesta tallennetaan raakatiedosto, sukelluksia EI tallenneta sukelluslistaan.</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>Valitse tiedosto sukellustietokoneen latauksen raakatiedostolle</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>Raakatiedostot (*.bin)</translation>
     </message>
@@ -952,7 +1049,7 @@ poista ensin pysähdykset.</translation>
 <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>Muokkaa valittuja sukelluskohteita</translation>
     </message>
@@ -961,848 +1058,854 @@ poista ensin pysähdykset.</translation>
     <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>Muistiinpanot</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>Kohde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="148"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Coordinates</source>
         <translation>Koordinaatit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="169"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
         <source>Divemaster</source>
         <translation>Sukellusvanhin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="155"/>
+        <location filename="../qt-ui/maintab.ui" line="148"/>
         <source>Buddy</source>
         <translation>Sukelluspari</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="63"/>
-        <source>Start time</source>
-        <translation>Alkuaika</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>Ilman lämpötila</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>Veden lämpötila</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="127"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Tags</source>
         <translation>Avainsanat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="223"/>
         <source>Rating</source>
         <translation>Yleisarvio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="236"/>
         <source>Visibility</source>
         <translation>Näkyvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="215"/>
+        <location filename="../qt-ui/maintab.ui" line="127"/>
         <source>Suit</source>
         <translation>Puku</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>Muistiinpanot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="270"/>
+        <location filename="../qt-ui/maintab.ui" line="311"/>
         <source>Equipment</source>
         <translation>Varusteet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="350"/>
+        <location filename="../qt-ui/maintab.ui" line="391"/>
         <source>Dive Info</source>
         <translation>Tiedot</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>Ajankohta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="414"/>
+        <location filename="../qt-ui/maintab.ui" line="275"/>
+        <source>Time</source>
+        <translation>Kello</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="455"/>
         <source>Interval</source>
         <translation>Pinta-aika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="433"/>
+        <location filename="../qt-ui/maintab.ui" line="474"/>
         <source>Gases Used</source>
         <translation>Käytetyt kaasut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="452"/>
+        <location filename="../qt-ui/maintab.ui" line="493"/>
         <source>Gas Consumed</source>
         <translation>Kaasun kulutus</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>Pintakulutus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="531"/>
         <source>Max. Depth</source>
         <translation>Maksimisyvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="509"/>
+        <location filename="../qt-ui/maintab.ui" line="550"/>
         <source>Ave. Depth</source>
         <translation>Keskisyvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="528"/>
+        <location filename="../qt-ui/maintab.ui" line="569"/>
         <source>OTU</source>
         <translation>Happikertymä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="547"/>
+        <location filename="../qt-ui/maintab.ui" line="588"/>
         <source>Air Pressure</source>
         <translation>Ilmanpaine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="566"/>
+        <location filename="../qt-ui/maintab.ui" line="607"/>
         <source>Air Temperature</source>
         <translation>Ilman lämpötila</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="585"/>
+        <location filename="../qt-ui/maintab.ui" line="626"/>
         <source>Water Temperature</source>
         <translation>Veden lämpötila</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="604"/>
+        <location filename="../qt-ui/maintab.ui" line="645"/>
         <source>Dive Time</source>
         <translation>Kesto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="623"/>
+        <location filename="../qt-ui/maintab.ui" line="664"/>
         <source>Salinity</source>
         <translation>Suolapitoisuus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="660"/>
+        <location filename="../qt-ui/maintab.ui" line="701"/>
         <source>Stats</source>
         <translation>Tilastot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="746"/>
         <source>Depth</source>
         <translation>Syvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Temperature</source>
         <translation>Lämpötila</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="784"/>
         <source>Duration</source>
         <translation>Kesto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Total Time</source>
         <translation>Kokonaiskesto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="835"/>
         <source>Dives</source>
         <translation>Sukelluksia</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="919"/>
+        <source>Photos</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="89"/>
         <source>Cylinders</source>
         <translation>Säiliöt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="90"/>
         <source>Add Cylinder</source>
         <translation>Lisää säiliö</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="93"/>
         <source>Weights</source>
         <translation>Painot</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>Lisää painojärjestelmä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="438"/>
+        <location filename="../qt-ui/maintab.cpp" line="409"/>
         <source>Trip Location</source>
         <translation>Matkakohde</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>Matkan muistiinpanot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="42"/>
+        <location filename="../qt-ui/maintab.cpp" line="48"/>
         <source>Save</source>
         <translation>Tallenna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="46"/>
+        <location filename="../qt-ui/maintab.cpp" line="52"/>
         <source>Cancel</source>
         <translation>Peruuta</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>Ilman lämpötila [%1]</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>Veden lämpötila [%1]</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>Tätä sukellusretkeä muokataan.</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>Muokataan useita sukelluksia.</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>Tätä sukellusta muokataan.</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>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="494"/>
+        <location filename="../qt-ui/maintab.cpp" line="464"/>
         <source>unknown</source>
         <translation>tuntematon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>N</source>
-        <translation>N</translation>
+        <location filename="../qt-ui/maintab.cpp" line="501"/>
+        <source>Deepest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>S</source>
-        <translation>S</translation>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <source>Shallowest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>E</source>
-        <translation>E</translation>
+        <location filename="../qt-ui/maintab.cpp" line="794"/>
+        <source>Discard the Changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>W</source>
-        <translation>W</translation>
+        <location filename="../qt-ui/maintab.cpp" line="795"/>
+        <source>You are about to discard your changes.</source>
+        <translation type="unfinished"/>
     </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>Suodattimet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="571"/>
+        <location filename="../qt-ui/mainwindow.ui" line="646"/>
         <source>&amp;File</source>
         <translation>Tiedosto</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="583"/>
+        <source>Print</source>
+        <translation>Tulosta</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:'Courier'; 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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
         <source>&amp;Log</source>
         <translation>Loki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="606"/>
+        <location filename="../qt-ui/mainwindow.ui" line="679"/>
         <source>&amp;View</source>
         <translation>Näkymä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="628"/>
+        <location filename="../qt-ui/mainwindow.ui" line="701"/>
         <source>&amp;Help</source>
         <translation>Apua</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="636"/>
+        <location filename="../qt-ui/mainwindow.ui" line="709"/>
         <source>&amp;Import</source>
         <translation>Liitä</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>Uusi loki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="655"/>
+        <location filename="../qt-ui/mainwindow.ui" line="728"/>
         <source>New</source>
         <translation>Uusi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="658"/>
+        <location filename="../qt-ui/mainwindow.ui" line="731"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</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>Avaa loki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="666"/>
+        <location filename="../qt-ui/mainwindow.ui" line="739"/>
         <source>Open</source>
         <translation>Avaa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <location filename="../qt-ui/mainwindow.ui" line="742"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="674"/>
+        <location filename="../qt-ui/mainwindow.ui" line="747"/>
         <source>&amp;Save</source>
         <translation>Tallenna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="677"/>
+        <location filename="../qt-ui/mainwindow.ui" line="750"/>
         <source>Save</source>
         <translation>Tallenna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="680"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>Save as</source>
         <translation>Tallenna nimellä...</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>Ctrl+Shift+S</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>Sulje</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Close</source>
         <translation>Sulje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="702"/>
+        <location filename="../qt-ui/mainwindow.ui" line="775"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="902"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <source>P&amp;references</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="831"/>
+        <source>&amp;Add Dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <source>Auto &amp;Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="863"/>
+        <source>&amp;Dive List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="871"/>
+        <source>&amp;Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="879"/>
+        <source>&amp;Info</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="887"/>
+        <source>&amp;All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="895"/>
+        <source>P&amp;rev DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="903"/>
+        <source>&amp;Next DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="911"/>
+        <source>&amp;Select Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <source>&amp;About Subsurface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="937"/>
+        <source>&amp;Globe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="953"/>
+        <source>&amp;Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="959"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="707"/>
-        <source>Export &amp;UDDF</source>
-        <translation>Vie UDDF</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="1008"/>
+        <source>&amp;Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1011"/>
+        <source>Export Dive Logs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1014"/>
+        <source>Ctrl+E</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Enable the pN2 Graph</source>
         <translation>Näytä pN2 -kuvaaja</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <location filename="../qt-ui/mainwindow.ui" line="128"/>
         <source>Enable the pHe graph</source>
         <translation>Näytä pHe-kuvaaja</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <location filename="../qt-ui/mainwindow.ui" line="290"/>
         <source>Show/hide heart rate</source>
         <translation>Näytä/piilota syke</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <location filename="../qt-ui/mainwindow.ui" line="342"/>
         <source>Enable EAD, END, and EADD</source>
         <translation>Näytä EAD, END ja EADD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="238"/>
         <source>Show NDL / TTS</source>
         <translation>Näytä NDL / TTS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="456"/>
+        <location filename="../qt-ui/mainwindow.ui" line="394"/>
         <source>Rescale depth axis</source>
         <translation>Skaalaa syvyysakseli</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="710"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="715"/>
-        <source>Export HTML World Map</source>
-        <translation>Vie maailmankartta (HTML)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="718"/>
-        <source>Ctrl+H</source>
-        <translation>Ctrl+H</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="723"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>&amp;Print</source>
         <translation>Tulosta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="734"/>
+        <location filename="../qt-ui/mainwindow.ui" line="791"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="742"/>
+        <location filename="../qt-ui/mainwindow.ui" line="799"/>
         <source>&amp;Quit</source>
         <translation>Lopeta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="753"/>
+        <location filename="../qt-ui/mainwindow.ui" line="810"/>
         <source>Import from &amp;dive computer</source>
         <translation>Hae sukellustietokoneelta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="818"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation>Liitä GPS-tiedot Subsurfacen on-line -palvelusta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="764"/>
+        <location filename="../qt-ui/mainwindow.ui" line="821"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="826"/>
         <source>&amp;Edit Device Names</source>
         <translation>Muokkaa laitenimiä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="834"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="782"/>
+        <location filename="../qt-ui/mainwindow.ui" line="839"/>
         <source>&amp;Renumber</source>
         <translation>Uudellennumeroi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="785"/>
+        <location filename="../qt-ui/mainwindow.ui" line="842"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="798"/>
+        <location filename="../qt-ui/mainwindow.ui" line="855"/>
         <source>&amp;Yearly Statistics</source>
         <translation>Vuositilastot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="801"/>
+        <location filename="../qt-ui/mainwindow.ui" line="858"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="806"/>
-        <source>Dive List</source>
-        <translation>Sukelluslista</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="814"/>
-        <source>Profile</source>
-        <translation>Profiilikuvaaja</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="822"/>
-        <source>Info</source>
-        <translation>Tiedot</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="830"/>
-        <source>All</source>
-        <translation>Kaikki</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="872"/>
+        <location filename="../qt-ui/mainwindow.ui" line="929"/>
         <source>User &amp;Manual</source>
         <translation>Käyttöohje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="880"/>
-        <source>Globe</source>
-        <translation>Maapallo</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="888"/>
+        <location filename="../qt-ui/mainwindow.ui" line="945"/>
         <source>P&amp;lan Dive</source>
         <translation>Sukelluksen suunnittelu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="891"/>
+        <location filename="../qt-ui/mainwindow.ui" line="948"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="907"/>
-        <source>Import from Divelogs.de</source>
-        <translation>Tuo Divelogs.de -sivustolta</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1003"/>
         <source>&amp;Check for Updates</source>
         <translation>Tarkista päivitykset</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="951"/>
-        <source>Export CSV</source>
-        <translation>Vie CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="726"/>
+        <location filename="../qt-ui/mainwindow.ui" line="783"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</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>Näytä pO2 -kaavio</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>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="316"/>
         <source>Enable MOD</source>
         <translation>Näytä MOD</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>Näytä sukellustietokoneen raportoima kattosyvyys</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>Näytä laskettu kattosyvyys</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>Näytä laskettu kattosyvyys 3m:n tarkkuudella</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>Laske kaikki kudokset</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>Näytä hengitysnopeus</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>Näytä / piilota viivain</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="731"/>
-        <source>Preferences</source>
-        <translation>Asetukset</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="745"/>
+        <location filename="../qt-ui/mainwindow.ui" line="802"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="756"/>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="774"/>
-        <source>Add Dive</source>
-        <translation>Lisää sukellus</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="793"/>
-        <source>Auto Group</source>
-        <translation>Ryhmittele automaattisesti</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="809"/>
+        <location filename="../qt-ui/mainwindow.ui" line="866"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="817"/>
+        <location filename="../qt-ui/mainwindow.ui" line="874"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <location filename="../qt-ui/mainwindow.ui" line="882"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="833"/>
+        <location filename="../qt-ui/mainwindow.ui" line="890"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="838"/>
-        <source>Prev DC</source>
-        <translation>Edellinen tietokone</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="841"/>
+        <location filename="../qt-ui/mainwindow.ui" line="898"/>
         <source>Left</source>
         <translation>Vasen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="846"/>
-        <source>Next DC</source>
-        <translation>Seuraava tietokone</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="849"/>
+        <location filename="../qt-ui/mainwindow.ui" line="906"/>
         <source>Right</source>
         <translation>Oikea</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="854"/>
-        <source>Select Events</source>
-        <translation>Valitse tapahtumat</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <location filename="../qt-ui/mainwindow.ui" line="916"/>
         <source>Input Plan</source>
         <translation>Suunnittele</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="864"/>
-        <source>About Subsurface</source>
-        <translation>Tietoja Subsurfacesta</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="875"/>
+        <location filename="../qt-ui/mainwindow.ui" line="932"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="883"/>
+        <location filename="../qt-ui/mainwindow.ui" line="940"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="896"/>
-        <source>Import Log Files</source>
-        <translation>Liitä lokitiedostoja</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="899"/>
+        <location filename="../qt-ui/mainwindow.ui" line="956"/>
         <source>Import divelog files from other applications</source>
         <translation>Liitä lokitiedostoja toisesta sovelluksesta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="915"/>
+        <location filename="../qt-ui/mainwindow.ui" line="964"/>
+        <source>Import &amp;from Divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="972"/>
         <source>&amp;Full Screen</source>
         <translation>Kokoruututila</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>Käytä kokoruututilaa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <location filename="../qt-ui/mainwindow.ui" line="978"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="174"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
         <source>Open File</source>
         <translation>Avaa tiedosto</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>Ole hyvä ja tallenna tai peruuta sukelluksen muokkaus ennen lokitiedoston sulkemista.</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>
-        <translation>Ole hyvä ja tallenna tai peruuta sukelluksen muokkaus, ennen sukelluksen suunnittelua.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="396"/>
+        <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>Ole hyvä ja tallenna tai peruuta sukelluksen muokkaus ennen sukelluksen lisäystä.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="645"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="419"/>
+        <source>Print runtime table</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="710"/>
         <source>Do you want to save the changes you made in the file %1?</source>
         <translation>Haluatko tallentaa muutoksesi tiedostoon %1?</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>Haluatko tallentaa muutoksesi tiedostoon?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="652"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="717"/>
         <source>Save Changes?</source>
         <translation>Tallenna muutokset?</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>Muutokset hylätään, jos et tallenna niitä.</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>Tallenna nimellä</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>Varoitus</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>Ole hyvä ja tallenna tai peruuta sukelluksen muokkaus ennen kuin avaat uuden lokin.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="280"/>
-        <source>Export UDDF File as</source>
-        <translation>Vie UDDF tiedostoon</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="281"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>UDDF -tiedostot (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="289"/>
-        <source>Export CSV File as</source>
-        <translation>Vie CSV tiedostoon</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="290"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>CSV tiedostot (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="299"/>
-        <source>Export World Map</source>
-        <translation>Vie maailmankartta</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="300"/>
-        <source>HTML files (*.html)</source>
-        <translation>HTML -tiedostot (*.html)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="449"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="514"/>
         <source>Yearly Statistics</source>
         <translation>Vuositilastot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="961"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1076"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurfacen XML tiedostot (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1199"/>
         <source>Open Dive Log File</source>
         <translation>Avaa sukellusloki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <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>Sukelluslokitiedostot (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML tiedostot (*.xml);;UDDF/UDCF tiedostot(*.uddf *.udcf);;JDiveLog tiedostot(*.jlb);;Suunto-lokit(*.sde *.db);;CSV Files(*.csv);;All Files(*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1225"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Ole hyvä ja lopeta nykyinen muokkaus ennen kuin aloitat uuden.</translation>
     </message>
 </context>
 <context>
+    <name>PlannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Last stop at 20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="416"/>
+        <source>Last stop at 6m</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>PreferencesDialog</name>
     <message>
         <location filename="../qt-ui/preferences.ui" line="85"/>
@@ -1825,247 +1928,297 @@ poista ensin pysähdykset.</translation>
         <translation>Kieli</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="151"/>
         <source>Lists and Tables</source>
         <translation>Listat ja taulukot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font</source>
         <translation>Fontti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="167"/>
         <source>Font size</source>
         <translation>Fontin koko</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="170"/>
+        <location filename="../qt-ui/preferences.ui" line="180"/>
         <source>Dives</source>
         <translation>Sukelluksia</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>Oletus lokitiedosto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="188"/>
+        <location filename="../qt-ui/preferences.ui" line="198"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="197"/>
+        <location filename="../qt-ui/preferences.ui" line="207"/>
         <source>Display Invalid</source>
         <translation>Näytä epäkelvot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="214"/>
+        <location filename="../qt-ui/preferences.ui" line="224"/>
         <source>Default Cylinder</source>
         <translation>Oletussäiliö</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>Käytä oletussäiliötä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <location filename="../qt-ui/preferences.ui" line="247"/>
         <source>Animations</source>
         <translation>Animaatiot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <location filename="../qt-ui/preferences.ui" line="253"/>
         <source>Speed</source>
         <translation>Nopeus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="270"/>
+        <location filename="../qt-ui/preferences.ui" line="280"/>
         <source>Subsurface Webservice</source>
         <translation>Subsurfacen verkkopalvelu</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>Oletuskäyttäjätunnus</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>Tallennetaanko käyttäjätunnus paikallisesti?</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="312"/>
+        <source>Reset all settings to their default value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
         <source>System</source>
         <translation>Järjestelmä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="348"/>
         <source>Metric</source>
         <translation>Metrinen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="333"/>
+        <location filename="../qt-ui/preferences.ui" line="358"/>
         <source>Imperial</source>
         <translation>Brittiläinen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="343"/>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
         <source>Personalize</source>
         <translation>Mukauta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="392"/>
         <source>Depth</source>
         <translation>Syvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="374"/>
+        <location filename="../qt-ui/preferences.ui" line="399"/>
         <source>meter</source>
         <translation>metri</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="409"/>
         <source>feet</source>
         <translation>jalka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="401"/>
+        <location filename="../qt-ui/preferences.ui" line="426"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="411"/>
+        <location filename="../qt-ui/preferences.ui" line="436"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="428"/>
+        <location filename="../qt-ui/preferences.ui" line="453"/>
         <source>liter</source>
         <translation>litra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="438"/>
+        <location filename="../qt-ui/preferences.ui" line="463"/>
         <source>cu ft</source>
         <translation>kuutiojalka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="455"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>celsius</source>
         <translation>Celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="465"/>
+        <location filename="../qt-ui/preferences.ui" line="490"/>
         <source>fahrenheit</source>
         <translation>Fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="482"/>
+        <location filename="../qt-ui/preferences.ui" line="507"/>
         <source>kg</source>
         <translation>kg</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>kynnysarvo pO₂:lle</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>kynnysarvo pN₂:lle</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>kynnysarvo pHe:lle</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="636"/>
-        <source>max ppO₂ when showing MOD</source>
-        <translation>maksimi ppO₂, kun näytetään MOD</translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="811"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="817"/>
+        <source>Proxy type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="830"/>
+        <source>Host</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="856"/>
+        <source>Port</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="882"/>
+        <source>Requires authentication</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="657"/>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="925"/>
+        <source>Password</source>
+        <translation>Salasana</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="682"/>
         <source>draw dive computer reported ceiling red</source>
         <translation>Näytä sukellustietokoneen raportoima kattosyvyys punaisella</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="747"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>System Default</source>
         <translation>Järjestelmän oletus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="767"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>Filter</source>
         <translation>Suodattimet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="419"/>
         <source>Pressure</source>
         <translation>Paine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="421"/>
+        <location filename="../qt-ui/preferences.ui" line="446"/>
         <source>Volume</source>
         <translation>Tilavuus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="448"/>
+        <location filename="../qt-ui/preferences.ui" line="473"/>
         <source>Temperature</source>
         <translation>Lämpötila</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="475"/>
+        <location filename="../qt-ui/preferences.ui" line="500"/>
         <source>Weight</source>
         <translation>Painot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="517"/>
         <source>lbs</source>
         <translation>pauna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="507"/>
+        <location filename="../qt-ui/preferences.ui" line="532"/>
         <source>Time units</source>
         <translation>Aikayksiköt</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>Nousu/laskunopeuden yksikkö</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="520"/>
+        <location filename="../qt-ui/preferences.ui" line="545"/>
         <source>Minutes</source>
         <translation>Minuuttia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="530"/>
+        <location filename="../qt-ui/preferences.ui" line="555"/>
         <source>Seconds</source>
         <translation>Sekuntia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="562"/>
+        <location filename="../qt-ui/preferences.ui" line="587"/>
         <source>Show</source>
         <translation>Näytä</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="693"/>
         <source>Show non-used cylinders in Equipment Tab</source>
         <translation>Näytä käyttämättömät säiliöt varusteluettelossa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="679"/>
+        <location filename="../qt-ui/preferences.ui" line="704"/>
         <source>show average depth</source>
         <translation>näytä keskisyvyys</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>GFLow maksimisyvyydessä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="691"/>
+        <location filename="../qt-ui/preferences.ui" line="716"/>
         <source>Misc</source>
         <translation>Sekalaiset</translation>
     </message>
@@ -2075,36 +2228,66 @@ poista ensin pysähdykset.</translation>
         <translation>Asetukset</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="697"/>
+        <location filename="../qt-ui/preferences.ui" line="722"/>
         <source>GFLow</source>
         <translation>GFlow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="739"/>
         <source>GFHigh</source>
         <translation>GFhigh</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="24"/>
+        <source>System proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="25"/>
+        <source>HTTP proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="26"/>
+        <source>SOCKS proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="245"/>
         <source>Restart required</source>
         <translation>Vaaditaan uudelleenkäynnistys</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>Uuden kielen lataaminen vaatii Subsurfacen uudelleenkäynnistyksen
 </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>Avaa oletustiedosto</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>Subsurfacen XML tiedostot (*.ssrf *.xml *.XML)</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="394"/>
+        <source>Warning</source>
+        <translation>Varoitus</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"/>
+    </message>
 </context>
 <context>
     <name>PrintDialog</name>
@@ -2245,72 +2428,72 @@ poista ensin pysähdykset.</translation>
 <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>tuntematon</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>Sukellus #%1 - %2</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>Suurin syvyys: %1 %2</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>Kesto: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1918"/>
+        <location filename="../qt-ui/models.cpp" line="1898"/>
         <source>Gas Used:</source>
         <translation>Kaasu:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1920"/>
+        <location filename="../qt-ui/models.cpp" line="1900"/>
         <source>SAC:</source>
         <translation>Pintakulutus:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1922"/>
+        <location filename="../qt-ui/models.cpp" line="1902"/>
         <source>Max. CNS:</source>
         <translation>Max CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1924"/>
+        <location filename="../qt-ui/models.cpp" line="1904"/>
         <source>Weights:</source>
         <translation>Painot:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1929"/>
+        <location filename="../qt-ui/models.cpp" line="1909"/>
         <source>Notes:</source>
         <translation>Muistiinpanot:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1936"/>
+        <location filename="../qt-ui/models.cpp" line="1916"/>
         <source>Divemaster:</source>
         <translation>Sukellusvanhin:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1938"/>
+        <location filename="../qt-ui/models.cpp" line="1918"/>
         <source>Buddy:</source>
         <translation>Sukelluspari:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1940"/>
+        <location filename="../qt-ui/models.cpp" line="1920"/>
         <source>Suit:</source>
         <translation>Puku:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1942"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>Viz:</source>
         <translation>Näkyvyys:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1944"/>
+        <location filename="../qt-ui/models.cpp" line="1924"/>
         <source>Rating:</source>
         <translation>Yleisarvio:</translation>
     </message>
@@ -2318,62 +2501,77 @@ poista ensin pysähdykset.</translation>
 <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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/>
+        <source>Make first divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="906"/>
+        <source>Delete this divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="913"/>
         <source>Add Gas Change</source>
         <translation>Lisää kaasun vaihto</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>Lisää kirjanmerkki</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>Poista tapahtuma</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>Piilota samankaltaiset tapahtumat</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>Muokkaa nimeä</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>Näytä kaikki tapahtumat</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>Piilota tapahtumat</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>Piilota kaikki %1 tapahtumat</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>Poistetaanko valitut tapahtumat?</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>%1 @ %2:%3</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>Muokkaa kirjanmerkin nimeä</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>Valinnainen nimi:</translation>
     </message>
@@ -2381,12 +2579,12 @@ poista ensin pysähdykset.</translation>
 <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>Ilma</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>Poista tämä etappi</translation>
     </message>
@@ -2396,22 +2594,22 @@ poista ensin pysähdykset.</translation>
         <translation>Sulje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="34"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation>Keskim.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="37"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation>Alin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="40"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation>Korkein</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>Kaksoisnäpäytä karttaa valitaksesi sukelluskohteen</translation>
     </message>
@@ -2425,9 +2623,23 @@ poista ensin pysähdykset.</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="128"/>
         <source>New starting number</source>
         <translation>Uusi aloitusnumero</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="126"/>
+        <source>New number</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchBar</name>
+    <message>
+        <location filename="../qt-ui/searchbar.ui" line="14"/>
+        <source>Form</source>
+        <translation>Lomake</translation>
+    </message>
 </context>
 <context>
     <name>ShiftImageTimesDialog</name>
@@ -2442,42 +2654,47 @@ poista ensin pysähdykset.</translation>
         <translation>Siirrä kuvien aikaleimaa:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="102"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="95"/>
+        <source>h:mm</source>
+        <translation>h:mm</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="105"/>
         <source>earlier</source>
         <translation>aiemmin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="109"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="112"/>
         <source>later</source>
         <translation>myöhemmin</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>Laskeaksesi kameran ja sukellustietokoneen kellojen aikaeron, ota kuva sukellustietokoneestasi, lataa tämä kuva ja paina tätä painiketta.</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>Määritä kameran kellon aika</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>Valitse kuva, joka näyttää sukellustietokoneen kellonajan</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>Mikä päivä ja aika näkyy kuvassa?</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>Avaa kuvatiedosto</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>Kuvatiedostot (</translation>
     </message>
@@ -2557,42 +2774,42 @@ poista ensin pysähdykset.</translation>
 <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>Verkkopalvelu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/>
         <source>Connecting...</source>
         <translation>Yhdistetään...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="421"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="419"/>
         <source>Download finished</source>
         <translation>Lataus valmistui</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>Virhe latauksessa: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/>
         <source>Connection Error: </source>
         <translation>Yhteysvirhe:</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>Tuntematon käyttäjä!</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>Vastauksen jäsentäminen ei onnistu!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/>
         <source>Download Success!</source>
         <translation>Lataus onnistui!</translation>
     </message>
@@ -2608,17 +2825,17 @@ poista ensin pysähdykset.</translation>
 <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>Kuvaus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2626,7 +2843,7 @@ poista ensin pysähdykset.</translation>
 <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>Tiedot</translation>
     </message>
@@ -2634,42 +2851,42 @@ poista ensin pysähdykset.</translation>
 <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>Tarkista päivitykset.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="37"/>
-        <source>&lt;h3&gt;Subsurface was unable to check for updates.&lt;/h3&gt;</source>
-        <translation>&lt;h3&gt;Päivitysten tarkistus epäonnistui.&lt;/h3&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="36"/>
+        <source>Subsurface was unable to check for updates.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
-        <source>&lt;br/&gt;&lt;b&gt;The following error occurred:&lt;/b&gt;&lt;br/&gt;</source>
-        <translation>&lt;br/&gt;&lt;b&gt;Tapahtui seuraava virhe:&lt;/b&gt;&lt;br/&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="41"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="43"/>
-        <source>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Please check your internet connection.&lt;/b&gt;</source>
-        <translation>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Tarkista Internet-yhteytesi.&lt;/b&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
     </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>Käytössä on uusin versio Subsurfacesta.</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>Saatavilla on uusi versio Subsurfacesta.&lt;br/&gt;Näpäytä:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; ladataksesi sen.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="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>&lt;b&gt;Saatavilla on uusi versio Subsurfacesta.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</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>Päivitysten tarkastuksssa tapahtui virhe.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -2677,25 +2894,163 @@ poista ensin pysähdykset.</translation>
 <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>Käyttöohje</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>Subsurfacen käyttöohje ei löydy</translation>
     </message>
 </context>
 <context>
+    <name>UserSurvey</name>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>Dialogi</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="47"/>
+        <source>Subsurface User Survey</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="79"/>
+        <source>Recreational DIver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="92"/>
+        <source>Tech Diver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="105"/>
+        <source>Interested in dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="118"/>
+        <source>I am downloading dives from supported dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="131"/>
+        <source>I am importing dives from other software / sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="144"/>
+        <source>I am manually entering dives</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="190"/>
+        <source>Please type suggestions (in English) in the following box</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="27"/>
+        <source>
+Operating System: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="30"/>
+        <source>
+CPU Architecture: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="35"/>
+        <source>
+OS CPU Architecture %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="39"/>
+        <source>
+Language: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="73"/>
+        <source>Should we ask you later?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="74"/>
+        <source>Don&apos;t ask me again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="75"/>
+        <source>Ask Later</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="76"/>
+        <source>Ask again?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <source>Submit User Survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <source>Subsurface was unable to submit the user survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="101"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="102"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="111"/>
+        <source>Survey successfully submitted.</source>
+        <translation type="unfinished"/>
+    </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>Päivitysten tarkastuksssa tapahtui virhe.&lt;br/&gt;&lt;br/&gt;%1</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>Kuvaus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="723"/>
+        <location filename="../qt-ui/models.cpp" line="721"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2743,12 +3098,12 @@ poista ensin pysähdykset.</translation>
         <translation>Lähetä</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>Toimenpide ei valmistunut ajoissa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="279"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="277"/>
         <source>Transfering data...</source>
         <translation>Tietoa siirretään...</translation>
     </message>
@@ -2756,37 +3111,37 @@ poista ensin pysähdykset.</translation>
 <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>Tyyppi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="368"/>
+        <location filename="../qt-ui/models.cpp" line="373"/>
         <source>Weight</source>
         <translation>Painot</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>Poista painojärjestelmä näpäyttämällä ikonia.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="453"/>
+        <location filename="../qt-ui/models.cpp" line="458"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="454"/>
+        <location filename="../qt-ui/models.cpp" line="459"/>
         <source>lbs</source>
         <translation>pauna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="478"/>
+        <location filename="../qt-ui/models.cpp" line="483"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="484"/>
         <source>m</source>
         <translation>m</translation>
     </message>
@@ -2794,79 +3149,79 @@ poista ensin pysähdykset.</translation>
 <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>Vuosi
 &gt; Kuukausi / Retki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1643"/>
         <source>Duration 
  Total</source>
         <translation>Kesto
 Kokonais</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>
 Average</source>
         <translation>
 Keskim.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>
 Shortest</source>
         <translation>
 Lyhin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>
 Longest</source>
         <translation>
 Pisin</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>Dyvyys (%1)
 Keski</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>
 Alin</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>
 Suurin</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>SAC (%1)
 Keski</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>Lämpö (%1)
@@ -2876,99 +3231,92 @@ Keski</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="58"/>
+        <location filename="../dive.c" line="87"/>
         <source>pascal</source>
         <translation>Pa</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>bar</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>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="104"/>
-        <location filename="../qt-gui.cpp" line="292"/>
-        <source>l</source>
-        <translation>l</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>ft³</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>m</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>ft</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>pauna</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>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1120"/>
+        <location filename="../dive.c" line="1237"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) tai (%s)</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>ilma</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="170"/>
+        <location filename="../equipment.c" line="210"/>
         <source>integrated</source>
         <translation>integroitu</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="171"/>
+        <location filename="../equipment.c" line="211"/>
         <source>belt</source>
         <translation>vyöpaino</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="172"/>
+        <location filename="../equipment.c" line="212"/>
         <source>ankle</source>
         <translation>nilkkapaino</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="173"/>
+        <location filename="../equipment.c" line="213"/>
         <source>backplate weight</source>
         <translation>selkäpaino</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="174"/>
+        <location filename="../equipment.c" line="214"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -2985,253 +3333,253 @@ Keski</translation>
         <translation>Maksimimäärä sarakkeita CSV -tuonnissa on %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>none</source>
         <translation>ei mitään</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>deco stop</source>
         <translation>deko-pysähdys</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>rbt</source>
         <translation>pohja-aika</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ascent</source>
         <translation>nousu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ceiling</source>
         <translation>katto</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>workload</source>
         <translation>työmäärä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>transmitter</source>
         <translation>lähetin</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>violation</source>
         <translation>rike</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>bookmark</source>
         <translation>kirjanmerkki</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>surface</source>
         <translation>pinta</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>safety stop</source>
         <translation>turvapysähdys</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>Kaasun vaihto</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (voluntary)</source>
         <translation>turvapysähdys (vapaaehtoinen)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (mandatory)</source>
         <translation>turvapysähdys (pakollinen)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>deepstop</source>
         <translation>syväpysähdys</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>ceiling (safety stop)</source>
         <translation>katto (turvapysähdys)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>divetime</source>
         <translation>sukellusaika</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>liian syvällä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>maxdepth</source>
         <translation>Suurin syvyys</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>OLF</source>
         <translation>Happikertymä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>airtime</source>
         <translation>Ilma-aika</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>heading</source>
         <translation>suunta</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>tissue level warning</source>
         <translation>kudoskertymän varoitus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>non stop time</source>
         <translation>keskeytyksetön aika</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="163"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>invalid event number</source>
         <translation>tuntematon tapahtumanumero</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>Jäsentäjän luominen %s %s epäonnistui</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="411"/>
+        <location filename="../libdivecomputer.c" line="414"/>
         <source>Error registering the data</source>
         <translation>Virhe tiedon rekisteröinnissä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="419"/>
+        <location filename="../libdivecomputer.c" line="422"/>
         <source>Error parsing the datetime</source>
         <translation>Virhe ajan jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="438"/>
         <source>Dive %d: %s %d %04d</source>
         <translation>Sukellus %1$d: %3$d. %2$skuuta %4$04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="440"/>
+        <location filename="../libdivecomputer.c" line="443"/>
         <source>Error parsing the divetime</source>
         <translation>Virhe sukelluksen keston jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="449"/>
+        <location filename="../libdivecomputer.c" line="452"/>
         <source>Error parsing the maxdepth</source>
         <translation>Virhe maksimisyvyyden jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="458"/>
+        <location filename="../libdivecomputer.c" line="461"/>
         <source>Error parsing the gas mix count</source>
         <translation>Virhe kaasuseosten määrän jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="470"/>
+        <location filename="../libdivecomputer.c" line="473"/>
         <source>Error obtaining water salinity</source>
         <translation>Virhe veden suolapitoisuuden määrityksessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error obtaining surface pressure</source>
         <translation>Virhe ilmanpaineen määrityksessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the gas mix</source>
         <translation>Virhe kaasuseoksen jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="493"/>
+        <location filename="../libdivecomputer.c" line="496"/>
         <source>Error parsing the samples</source>
         <translation>Virhe näytteiden tulkinnassa</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="623"/>
+        <location filename="../libdivecomputer.c" line="626"/>
         <source>Event: waiting for user action</source>
         <translation>Tapahtuma: odotetaan käyttäjän toimia</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>malli=%u (0x%08x), firmware=%u (0x%08x), sarjanumero=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="691"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the event handler.</source>
         <translation>Virhe tapahtumakäsittelijän rekisteröinnissä.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="696"/>
+        <location filename="../libdivecomputer.c" line="699"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Virhe perumiskäsittelijän rekisteröinnissä.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="717"/>
+        <location filename="../libdivecomputer.c" line="720"/>
         <source>Dive data import error</source>
         <translation>Virhe sukellusten jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="756"/>
+        <location filename="../libdivecomputer.c" line="759"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>libdivecomputer-kontekstin luominen epäonnistui</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="763"/>
+        <location filename="../libdivecomputer.c" line="766"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Avaaminen epäonnistui: %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="462"/>
+        <location filename="../parse-xml.c" line="466"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Outo prosenttiosuus: %s
 </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>Tiedoston &apos;%s&apos; lukeminen epäonnistui.</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>Tietokantakysely &apos;get_events&apos; (nouda tapahtumat) epäonnistui.
 </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>Tietokantakysely &apos;get_tags&apos; epäonnistui.
@@ -3245,111 +3593,160 @@ Keski</translation>
 </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 '%s'.
 </source>
         <translation>Tietokantakysely epäonnistui &apos;%s&apos;.
 </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>Tietokantakysely &apos;get_cylinders&apos; epäonnistui.
 </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>Tietokantakysely &apos;get_changes&apos; epäonnistui.
 </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>Tietokantakysely &apos;get_profile_sample&apos; epäonnistui.
 </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>Tyylitiedoston %1 avaus ei onnistu</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>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="146"/>
-        <location filename="../planner.c" line="617"/>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation>Seosta %d/%d ei löydy</translation>
+        <location filename="../planner.c" line="159"/>
+        <location filename="../planner.c" line="752"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="308"/>
+        <location filename="../planner.c" line="345"/>
         <source>Too many gas mixes</source>
         <translation>Liian monta kaasuseosta</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="489"/>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation>%s
-Subsurfacen laskema sukellussuunnitelma
-perustuu arvoihin GFlow = %.0f ja GFhigh = %.0f
-
-</translation>
+        <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>VAROITUS: BUHLMANNIN ALGORITMIN TOTEUTUS JA SIIHEN PERUSTUVA SUKELLUSTEN SUUNNITTELUOMINAISUUS OVAT UUSIA, JOTEN NIITÄ ON TESTATTU VAIN RAJALLISESTI. SUKELLUKSIA SUUNNITELTAESSA EI TULE LUOTTAA VAIN NÄIHIN TULOKSIIN.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="530"/>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Siirtymä %.*f %s:n syvyyteen ajassa %d:%02d - aika %d:%02u kaasulla %s
-</translation>
+        <location filename="../planner.c" line="535"/>
+        <source>based on GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="539"/>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Pysy %.*f %s:n syvyydessä %d:%02d min - aika %d:%02u kaasulla %s
-</translation>
+        <location filename="../planner.c" line="538"/>
+        <source>Subsurface dive plan</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="550"/>
-        <source>Switch gas to %s
-</source>
-        <translation>Vaihda kaasu seuraavaan: %s
-</translation>
+        <location filename="../planner.c" line="542"/>
+        <source>depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="558"/>
-        <source>Gas consumption:
-</source>
-        <translation>Kaasun kulutus:
-</translation>
+        <location filename="../planner.c" line="545"/>
+        <source>runtime</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="569"/>
-        <source>%.0f%s of %s
-</source>
-        <translation>%.0f %s (%s)
-</translation>
+        <location filename="../planner.c" line="548"/>
+        <source>duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="551"/>
+        <source>gas</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="606"/>
+        <source>%3.0f%s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
+        <source>%3dmin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="629"/>
+        <source>Switch gas to %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="638"/>
+        <source>Gas consumption:</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="659"/>
+        <source>this is more gas than available in the specified cylinder!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="810"/>
+        <location filename="../planner.c" line="664"/>
+        <source>not enough reserve for gas sharing on ascent!</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="668"/>
+        <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="980"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1226"/>
+        <location filename="../profile.c" line="1250"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3358,70 +3755,69 @@ S: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1229"/>
+        <location filename="../profile.c" line="1253"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1233"/>
+        <location filename="../profile.c" line="1257"/>
         <source>T: %.1f%s
 </source>
         <translation>L: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1263"/>
         <source>V: %.1f%s
 </source>
         <translation>N: %.1f%s
 </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>SAC: %2.1fl/min
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1244"/>
+        <location filename="../profile.c" line="1268"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1246"/>
+        <location filename="../profile.c" line="1270"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1272"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="1274"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="1277"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1260"/>
+        <location filename="../profile.c" line="1284"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3430,7 +3826,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1264"/>
+        <location filename="../profile.c" line="1288"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3439,401 +3835,394 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1276"/>
+        <location filename="../profile.c" line="1300"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Turvapysähdys: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1279"/>
+        <location filename="../profile.c" line="1303"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Turvapysähdys: ajankohta? @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="1308"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
+        <location filename="../profile.c" line="1311"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deko: ajankohta? @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1291"/>
+        <location filename="../profile.c" line="1315"/>
         <source>In deco
 </source>
         <translation>Dekossa</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1293"/>
+        <location filename="../profile.c" line="1317"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1297"/>
+        <location filename="../profile.c" line="1321"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (lask.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1305"/>
+        <location filename="../profile.c" line="1329"/>
         <source>In deco (calc)
 </source>
         <translation>Dekossa (lask.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1307"/>
+        <location filename="../profile.c" line="1331"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1310"/>
+        <location filename="../profile.c" line="1334"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1313"/>
+        <location filename="../profile.c" line="1337"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Laskettu katto %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1319"/>
+        <location filename="../profile.c" line="1343"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Kudos %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1325"/>
+        <location filename="../profile.c" line="1349"/>
         <source>heartbeat: %d
 </source>
         <translation>syke: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1327"/>
+        <location filename="../profile.c" line="1351"/>
         <source>bearing: %d
 </source>
         <translation>suunta: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1419"/>
+        <location filename="../profile.c" line="1443"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sA: %d:%02d min</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>%s %sS:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1435"/>
+        <location filename="../profile.c" line="1459"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sS:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1439"/>
+        <location filename="../profile.c" line="1463"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sN:%.2f%s</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>%s %sN:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1454"/>
+        <location filename="../profile.c" line="1478"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="273"/>
+        <location filename="../qt-gui.cpp" line="281"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="276"/>
+        <location filename="../qt-gui.cpp" line="284"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="392"/>
-        <source>%1, %2 %3, %4 %5:%6</source>
-        <translation>%1, %3.%2.%4 %5:%6</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="405"/>
-        <source>%1 %2, %3
-%4:%5</source>
-        <translation>%2.%1.%3
-%4:%5</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="418"/>
+        <location filename="../qt-gui.cpp" line="417"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 dives)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="423"/>
+        <location filename="../qt-gui.cpp" line="422"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 dive)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>boat</source>
         <translation>vene</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>shore</source>
         <translation>ranta</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>drift</source>
         <translation>virta</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>deep</source>
         <translation>syvä</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>cavern</source>
         <translation>luola (cavern)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>ice</source>
         <translation>jää</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>wreck</source>
         <translation>hylky</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>cave</source>
         <translation>luola</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>altitude</source>
         <translation>korkeus</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>pool</source>
         <translation>uima-allas</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>lake</source>
         <translation>järvi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>river</source>
         <translation>joki</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>night</source>
         <translation>yö</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>fresh</source>
         <translation>makea</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>student</source>
         <translation>oppilas</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>photo</source>
         <translation>valokuva</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>video</source>
         <translation>video</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>instructor</source>
         <translation>kouluttaja</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="25"/>
         <source>deco</source>
         <translation>deko</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="216"/>
+        <location filename="../dive.c" line="133"/>
+        <source>ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="214"/>
         <source>more than %d days</source>
         <translation>yli %d päivää</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="220"/>
         <source>%dd %dh %dmin</source>
         <translation>%d pv %d t %d min</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="224"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dh %dmin</source>
         <translation>%d t %d min</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="235"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation>sukellukselle numero </translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="242"/>
+        <location filename="../statistics.c" line="240"/>
         <source>for selected dives</source>
         <translation>valitut sukellukset</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="275"/>
         <source>for dive #%d</source>
         <translation>Sukellus #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for selected dive</source>
         <translation>valittu sukellus</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for all dives</source>
         <translation>kaikille sukelluksille</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="283"/>
+        <location filename="../statistics.c" line="281"/>
         <source>(no dives)</source>
         <translation>(ei sukelluksia)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sun</source>
         <translation>su</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Mon</source>
         <translation>ma</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Tue</source>
         <translation>ti</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Wed</source>
         <translation>ke</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Thu</source>
         <translation>to</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Fri</source>
         <translation>pe</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sat</source>
         <translation>la</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jan</source>
         <translation>tammi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Feb</source>
         <translation>helmi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Mar</source>
         <translation>maalis</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Apr</source>
         <translation>huhti</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>May</source>
         <translation>touko</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jun</source>
         <translation>kesä</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Jul</source>
         <translation>heinä</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Aug</source>
         <translation>elo</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Sep</source>
         <translation>syys</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Oct</source>
         <translation>loka</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Nov</source>
         <translation>marras</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Dec</source>
         <translation>joulu</translation>
     </message>
@@ -3863,97 +4252,97 @@ Is the Uemis Zurich plugged in correctly?</source>
 Onko Uemis Zurich kytketty oikein?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="107"/>
+        <location filename="../uemis-downloader.c" line="111"/>
         <source>unknown</source>
         <translation>tuntematon</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="379"/>
+        <location filename="../uemis-downloader.c" line="383"/>
         <source>Reading %s %s</source>
         <translation>Luetaan sukellusta %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="399"/>
+        <location filename="../uemis-downloader.c" line="403"/>
         <source>data</source>
         <translation>tieto</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="420"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>divelog entry id</source>
         <translation>id: sukelluslokimerkintä</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="422"/>
+        <location filename="../uemis-downloader.c" line="426"/>
         <source>divespot data id</source>
         <translation>id: lisää sijaintitietoa</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
+        <location filename="../uemis-downloader.c" line="428"/>
         <source>more data dive id</source>
         <translation>id: lisää sukellusdataa</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>wetsuit</source>
         <translation>märkäpuku</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>semidry</source>
         <translation>puolikuiva</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>drysuit</source>
         <translation>kuivapuku</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>shorty</source>
         <translation>lyhyt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>vest</source>
         <translation>liivi</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>long john</source>
         <translation>haalari</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>jacket</source>
         <translation>takki</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>full suit</source>
         <translation>kokopuku</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>2 pcs full suit</source>
         <translation>Kaksiosainen kokopuku</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="620"/>
+        <location filename="../uemis-downloader.c" line="624"/>
         <source>membrane</source>
         <translation>laminaatti</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="802"/>
+        <location filename="../uemis-downloader.c" line="823"/>
         <source>Init Communication</source>
         <translation>Muodosta yhteys</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="804"/>
+        <location filename="../uemis-downloader.c" line="825"/>
         <source>Uemis init failed</source>
         <translation>Uemiksen lukeminen epäonnistui</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="815"/>
+        <location filename="../uemis-downloader.c" line="836"/>
         <source>Start download</source>
         <translation>Aloita lataus</translation>
     </message>
@@ -3974,18 +4363,18 @@ Onko Uemis Zurich kytketty oikein?</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="203"/>
-        <source>PO2 Green Warning</source>
-        <translation>Varoitus: hapen osapaine (green)</translation>
+        <source>pO₂ Green Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
-        <source>PO2 Ascend Warning</source>
-        <translation>Varoitus: hapen osapaine</translation>
+        <source>pO₂ Ascend Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="208"/>
-        <source>PO2 Ascend Alarm</source>
-        <translation>Hälytys: hapen osapaine</translation>
+        <source>pO₂ Ascend Alarm</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
@@ -4047,5 +4436,214 @@ Onko Uemis Zurich kytketty oikein?</translation>
         <source>Low Battery Alert</source>
         <translation>Hälytys: heikko paristo</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"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="36"/>
+        <source>Date:</source>
+        <translation>Päivä:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="38"/>
+        <source>Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="40"/>
+        <source>Duration:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="41"/>
+        <source>min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="43"/>
+        <source>Max Depth:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="46"/>
+        <source>Air Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="48"/>
+        <source>Water Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="50"/>
+        <source>Location:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="54"/>
+        <source>Notes:</source>
+        <translation>Muistiinpanot:</translation>
+    </message>
+</context>
+<context>
+    <name>plannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="14"/>
+        <source>Form</source>
+        <translation>Lomake</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="35"/>
+        <source>Rates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="56"/>
+        <source>Ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="77"/>
+        <source>below 75% avg. depth</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="94"/>
+        <source>75%-50% avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="111"/>
+        <source>50% avg. depth - 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="128"/>
+        <source>6m/20ft to surface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="148"/>
+        <source>Descent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="200"/>
+        <source>surface to the bottom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="226"/>
+        <source>Planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="247"/>
+        <source>GF low</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="264"/>
+        <source>GF high</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
+        <source>Drop to first depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
+        <source>Last Stop at 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>plan backgas breaks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="318"/>
+        <source>Gas Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <source>bottom SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="349"/>
+        <source>deco SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="359"/>
+        <source>bottom pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="389"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="382"/>
+        <source>deco pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="421"/>
+        <source>Dive Notes</source>
+        <translation>Muistiinpanot</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="445"/>
+        <source>display runtime</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="458"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="461"/>
+        <source>display segment duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="471"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="474"/>
+        <source>display transitions in deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="481"/>
+        <source>verbatim diveplan</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_fr_FR.ts b/translations/subsurface_fr_FR.ts
index f2179077c..36e3d543d 100644
--- a/translations/subsurface_fr_FR.ts
+++ b/translations/subsurface_fr_FR.ts
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="fr_FR" version="2.0">
+<defaultcodec>UTF-8</defaultcodec>
 <context>
     <name>CylindersModel</name>
     <message>
@@ -37,42 +38,42 @@
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="71"/>
+        <location filename="../qt-ui/models.cpp" line="70"/>
         <source>Switch at</source>
         <translation>Changement à</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>Cliquer ici retirera ce bloc.</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>Le bloc ne peut être retiré.</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>Ce gaz est utilisé. Seuls les blocs qui ne sont pas utilisés dans la plongée peuvent être retirés.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="507"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="508"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="527"/>
+        <location filename="../qt-ui/models.cpp" line="532"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="528"/>
+        <location filename="../qt-ui/models.cpp" line="533"/>
         <source>cuft</source>
         <translation>pied³</translation>
     </message>
@@ -100,22 +101,22 @@ l&apos;ordinateur de plongée sélectionné ?</translation>
 <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>Modèle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Device ID</source>
         <translation>Identifiant du périphérique</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Nickname</source>
         <translation>Nom</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>Cliquer ici retirera cet ordinateur de plongée.</translation>
     </message>
@@ -123,190 +124,326 @@ l&apos;ordinateur de plongée sélectionné ?</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="90"/>
-        <source>air</source>
-        <translation>air</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="92"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</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>Passer en CO</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> début</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> fin</translation>
     </message>
 </context>
 <context>
-    <name>DiveGasPressureItem</name>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="475"/>
-        <source>air</source>
-        <translation>air</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="476"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-</context>
-<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1258"/>
-        <source> l/min</source>
-        <translation>l/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
-        <source> cuft/min</source>
-        <translation> cuft/min</translation>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <source>/min</source>
+        <translation>/min</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>Montrer la barre de recherche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="706"/>
         <source>expand all</source>
         <translation>tout déplier</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="740"/>
+        <location filename="../qt-ui/divelistview.cpp" line="707"/>
         <source>collapse all</source>
         <translation>tout replier</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="741"/>
+        <location filename="../qt-ui/divelistview.cpp" line="708"/>
         <source>collapse others</source>
         <translation>replier les autres</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>retirer plongée(s) du groupe</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>créer un nouveau groupe au-dessus</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>ajouter plongée(s) au groupe immédiatement au-dessus</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>Ajouter plongée(s) au group immédiatement au-dessous</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>fusionner le groupe avec le groupe au-dessus</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>fusionner le groupe avec le groupe au dessous</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>supprimer plongée(s)</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>marquer la/les plongée(s) comme invalides</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
-        <source>save As</source>
-        <translation>Enregistrer sous</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="763"/>
-        <source>export As UDDF</source>
-        <translation>Exporter comme un fichier UDDF</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="764"/>
-        <source>export As CSV</source>
-        <translation>Exporter en CSV</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="744"/>
+        <source>renumber dive(s)</source>
+        <translation>renumeroter le(s) plongée(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="765"/>
+        <location filename="../qt-ui/divelistview.cpp" line="745"/>
         <source>shift times</source>
         <translation>décaler l&apos;heure</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="766"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>load images</source>
         <translation>Charger les images</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="769"/>
-        <source>upload dive(s) to divelogs.de</source>
-        <translation>Télécharger la/les plongée(s) vers divelogs.de</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Open Image Files</source>
+        <translation>Ouvrir un fichier image</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation>Images (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <source>merge selected dives</source>
+        <translation>fusionner les plongées sélectionnées</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="24"/>
+        <source>General Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="30"/>
+        <source>Export format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="42"/>
+        <source>Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="61"/>
+        <source>UDDF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="74"/>
+        <source>divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="84"/>
+        <source>CSV</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="94"/>
+        <source>Worldmap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="107"/>
+        <source>Selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="116"/>
+        <source>Selected dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="126"/>
+        <source>All dives</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="795"/>
-        <source>Save Dives As...</source>
-        <translation>Enregistrer les plongées sous...</translation>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="178"/>
+        <source>HTML</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="814"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="184"/>
+        <source>General Settings</source>
+        <translation>Préférences générales</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="190"/>
+        <source>Subsurface Numbers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="203"/>
+        <source>Selected Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="216"/>
+        <source>Minimum Javascript</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="229"/>
+        <source>All Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="239"/>
+        <source>Export List only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="252"/>
+        <source>Style Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="264"/>
+        <source>Font</source>
+        <translation>Police</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="274"/>
+        <source>Font size</source>
+        <translation>Taille de police</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
+        <source>8</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <source>10</source>
+        <translation>10</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <source>12</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <source>14</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <source>16</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <source>18</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <source>20</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="323"/>
+        <source>Theme</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <source>Sand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="153"/>
         <source>Export UDDF File as</source>
-        <translation>Exporter le ficher UDDF en</translation>
+        <translation>Exporter le fichier UDDF en</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>Fichiers UDDF (*.uddf *.UDDF)</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>Exporter le fichier CSV en</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>Fichiers CSV (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Open Image Files</source>
-        <translation>Ouvrir un fichier image</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="162"/>
+        <source>Export World Map</source>
+        <translation>Exporter la carte mondiale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
-        <translation>Images (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="163"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="177"/>
+        <source>HTML files (*.html)</source>
+        <translation>Fichiers HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="760"/>
-        <source>merge selected dives</source>
-        <translation>fusionner les plongées sélectionnées</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="167"/>
+        <source>Export Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="168"/>
+        <source>XML files (*.xml *.ssrf)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="176"/>
+        <source>Export HTML files as</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -317,138 +454,133 @@ l&apos;ordinateur de plongée sélectionné ?</translation>
         <translation>Importer des plongées depuis un fichier</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="36"/>
-        <source>Import CSV Dive Log Files</source>
-        <translation>Importer des plongées depuis un fichier CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="50"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
         <source>CSV options</source>
         <translation>Options CSV</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="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>Séparateur de champs</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>Importations préconfigurées</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>Configurations des champs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="80"/>
         <source>Depth</source>
         <translation>Profondeur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="100"/>
         <source>Stopdepth</source>
         <translation>Profondeur d’arrêt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="107"/>
         <source>PO2</source>
         <translation>PO2</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>Temps</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="121"/>
         <source>Temp</source>
         <translation>Temp.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="151"/>
         <source>Cns</source>
         <translation>SNC</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>Unités</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>Métrique</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>Impérial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="248"/>
         <source>Manual dives</source>
         <translation>Plongées manuelle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="283"/>
         <source>Dive #</source>
         <translation>Plongée n°</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="317"/>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="385"/>
         <source>Duration</source>
         <translation>Durée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="470"/>
         <source>Tags</source>
         <translation>Étiquettes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
         <source>Location</source>
         <translation>Lieu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="453"/>
         <source>Gps</source>
         <translation>Gps</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="300"/>
         <source>Max depth</source>
         <translation>Profondeur max.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="334"/>
         <source>Mean depth</source>
         <translation>Profondeur moy.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="368"/>
         <source>Buddy</source>
         <translation>Binôme</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="402"/>
         <source>Notes</source>
         <translation>Notes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="436"/>
         <source>Weight</source>
         <translation>Poids</translation>
     </message>
@@ -456,105 +588,70 @@ l&apos;ordinateur de plongée sélectionné ?</translation>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="71"/>
-        <source>Bottom SAC</source>
-        <translation>SAC au fond</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="85"/>
-        <source>SAC on DECO Stop</source>
-        <translation>SAC au palier</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="78"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="98"/>
-        <source>GFLow</source>
-        <translation>GFLow</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="106"/>
+        <source>Planned Dive Time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="125"/>
-        <source>Last Stop at 6m</source>
-        <translation>Dernier palier à 6m</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="134"/>
+        <source>Altitude</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="174"/>
-        <source>Start Time</source>
-        <translation>Heure de début</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="181"/>
+        <location filename="../qt-ui/diveplanner.ui" line="141"/>
         <source>ATM Pressure</source>
         <translation>Pression atmosphérique</translation>
     </message>
-</context>
-<context>
-    <name>DivePlannerGraphics</name>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="114"/>
-        <source>10m</source>
-        <translation>10m</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="116"/>
-        <source>30ft</source>
-        <translation>30ft</translation>
-    </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="363"/>
-        <source>Handler Position Error</source>
-        <translation>Gestion des positions problématiques</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="148"/>
+        <source>mbar</source>
+        <translation type="unfinished"/>
     </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>
-        <translation>Un ou plusieurs paliers seront perdus avec ces opérations,
-Veuillez d&apos;abord les supprimer.</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="158"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="445"/>
-        <source>AIR</source>
-        <translation>AIR</translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="137"/>
+        <source>unknown</source>
+        <translation>inconnu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1148"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="586"/>
         <source>Final Depth</source>
         <translation>Profondeur Finale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1150"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="588"/>
         <source>Run time</source>
         <translation>Temps de fonctionnement</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1152"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="590"/>
         <source>Duration</source>
         <translation>Durée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1154"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="592"/>
         <source>Used Gas</source>
         <translation>Gaz Utilisé</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>Recycleur</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>Annuler la planification ?</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>Vous allez annuler la planification.</translation>
     </message>
@@ -562,17 +659,17 @@ Veuillez d&apos;abord les supprimer.</translation>
 <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>Point planifiés</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="256"/>
         <source>Available Gases</source>
         <translation>Gaz disponibles</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>Ajouter un point de donnée</translation>
     </message>
@@ -616,8 +713,23 @@ Veuillez d&apos;abord les supprimer.</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
-        <source>Pressure  S</source>
-        <translation>Pression S</translation>
+        <source>Pressure S</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <source>pN₂</source>
+        <translation>pN₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>pHe</source>
+        <translation>pHe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
@@ -634,86 +746,71 @@ Veuillez d&apos;abord les supprimer.</translation>
         <source>SAC</source>
         <translation>Consommation d&apos;air</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
-        <source>PN2</source>
-        <translation>Pn2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
-        <source>PHE</source>
-        <translation>Pression Helium</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
-        <source>PO2</source>
-        <translation>PO2</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>N°</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>date</source>
         <translation>date</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>ft</source>
         <translation>pied</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1298"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>lbs</source>
         <translation>livre US</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
+        <location filename="../qt-ui/models.cpp" line="1307"/>
         <source>suit</source>
         <translation>combinaison</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1310"/>
         <source>cyl</source>
         <translation>blk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1344"/>
+        <location filename="../qt-ui/models.cpp" line="1325"/>
         <source>location</source>
         <translation>lieu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1316"/>
         <source>SAC</source>
         <translation>Consommation d&apos;air</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1338"/>
+        <location filename="../qt-ui/models.cpp" line="1319"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1341"/>
+        <location filename="../qt-ui/models.cpp" line="1322"/>
         <source>maxCNS</source>
         <translation>SNCmax</translation>
     </message>
@@ -721,115 +818,115 @@ Veuillez d&apos;abord les supprimer.</translation>
 <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>Réponse invalide du serveur</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>Le tag XML  &apos;DiveDateReader&apos; est attendu, &apos;%1&apos; a été lu</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>Le tag XML &apos;DiveDates&apos; n&apos;a pas été trouvé</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>Réponse XML mal formée. Ligne %1: %2</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>Aucune plongée sélectionnée</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>Erreur de création du fichier zip pour téléchargement: %s</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>Impossible d&apos;ouvrir le fichier temporaire: %s</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>Erreur interne: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="181"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="179"/>
         <source>internal error</source>
         <translation>Erreur interne</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>Terminé</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>Téléchargement de la liste des plongées</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>Téléchargement de la liste des plongées</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>%1 plongées en cours de téléchargement</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>Téléchargement terminé - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
         <source>Corrupted download</source>
         <translation>Téléchargement corrompu</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>L&apos;archive ne peut pas être ouverte:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Upload failed</source>
         <translation>Echec du téléchargement</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="849"/>
         <source>Upload successful</source>
         <translation>Téléchargement terminé avec succès</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="854"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="852"/>
         <source>Login failed</source>
         <translation>Echec de connexion</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>Impossible d&apos;analyser la réponse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="868"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Error: %1</source>
         <translation>Erreur: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="835"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/>
         <source>Upload finished</source>
         <translation>Téléchargement terminé</translation>
     </message>
@@ -837,54 +934,54 @@ Veuillez d&apos;abord les supprimer.</translation>
 <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>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="165"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/>
         <source>Error</source>
         <translation>Erreur</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>Essayer à nouveau</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>Chercher l&apos;ordinateur de plongée Uemis</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>Choisir le fichier pour le téléchargement du fichier log de l&apos;ordinateur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="323"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="325"/>
         <source>Log files (*.log)</source>
         <translation>Fichier de log (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="339"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
         <source>Warning</source>
         <translation>Avertissement</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>Sauvegarder le déchargement de libdivecomputer ne téléchargera pas les plongées dans la liste des plongées</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="351"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="352"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Choisir le fichier pour le fichier de déchargement de libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="353"/>
         <source>Dump files (*.bin)</source>
         <translation>Fichiers de décharge (*.bin)</translation>
     </message>
@@ -952,7 +1049,7 @@ Veuillez d&apos;abord les supprimer.</translation>
 <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>Modifier le lieu de la plongée sélectionnée</translation>
     </message>
@@ -961,848 +1058,854 @@ Veuillez d&apos;abord les supprimer.</translation>
     <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>Notes de plongée</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>Lieu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="148"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Coordinates</source>
         <translation>Coordonnées</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="169"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
         <source>Divemaster</source>
         <translation>Chef de palanquée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="155"/>
+        <location filename="../qt-ui/maintab.ui" line="148"/>
         <source>Buddy</source>
         <translation>Binôme</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="63"/>
-        <source>Start time</source>
-        <translation>Heure de début</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>Temp. air</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>Temp. eau</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="127"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Tags</source>
         <translation>Étiquettes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="223"/>
         <source>Rating</source>
         <translation>Évaluation</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="236"/>
         <source>Visibility</source>
         <translation>Visibilité</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="215"/>
+        <location filename="../qt-ui/maintab.ui" line="127"/>
         <source>Suit</source>
         <translation>Combinaison</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>Notes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="270"/>
+        <location filename="../qt-ui/maintab.ui" line="311"/>
         <source>Equipment</source>
         <translation>Équipement</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="350"/>
+        <location filename="../qt-ui/maintab.ui" line="391"/>
         <source>Dive Info</source>
         <translation>Détails de plongée</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>Date</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="414"/>
+        <location filename="../qt-ui/maintab.ui" line="275"/>
+        <source>Time</source>
+        <translation>Temps</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="455"/>
         <source>Interval</source>
         <translation>Intervalle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="433"/>
+        <location filename="../qt-ui/maintab.ui" line="474"/>
         <source>Gases Used</source>
         <translation>Gaz utilisés</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="452"/>
+        <location filename="../qt-ui/maintab.ui" line="493"/>
         <source>Gas Consumed</source>
         <translation>Gaz consommé</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>Consommation d&apos;air</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="531"/>
         <source>Max. Depth</source>
         <translation>Profondeur max.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="509"/>
+        <location filename="../qt-ui/maintab.ui" line="550"/>
         <source>Ave. Depth</source>
         <translation>Profondeur moy.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="528"/>
+        <location filename="../qt-ui/maintab.ui" line="569"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="547"/>
+        <location filename="../qt-ui/maintab.ui" line="588"/>
         <source>Air Pressure</source>
         <translation>Pression d&apos;air</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="566"/>
+        <location filename="../qt-ui/maintab.ui" line="607"/>
         <source>Air Temperature</source>
         <translation>Température air</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="585"/>
+        <location filename="../qt-ui/maintab.ui" line="626"/>
         <source>Water Temperature</source>
         <translation>Température eau</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="604"/>
+        <location filename="../qt-ui/maintab.ui" line="645"/>
         <source>Dive Time</source>
         <translation>Temps de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="623"/>
+        <location filename="../qt-ui/maintab.ui" line="664"/>
         <source>Salinity</source>
         <translation>Salinité</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="660"/>
+        <location filename="../qt-ui/maintab.ui" line="701"/>
         <source>Stats</source>
         <translation>Stats</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="746"/>
         <source>Depth</source>
         <translation>Profondeur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Temperature</source>
         <translation>Température</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="784"/>
         <source>Duration</source>
         <translation>Durée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Total Time</source>
         <translation>Temps total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="835"/>
         <source>Dives</source>
         <translation>Plongées</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="919"/>
+        <source>Photos</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="89"/>
         <source>Cylinders</source>
         <translation>Blocs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="90"/>
         <source>Add Cylinder</source>
         <translation>Ajouter un bloc</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="93"/>
         <source>Weights</source>
         <translation>Poids</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>Ajouter un système de poids</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="438"/>
+        <location filename="../qt-ui/maintab.cpp" line="409"/>
         <source>Trip Location</source>
         <translation>Lieu du groupe</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>Notes du groupe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="42"/>
+        <location filename="../qt-ui/maintab.cpp" line="48"/>
         <source>Save</source>
         <translation>Sauvegarder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="46"/>
+        <location filename="../qt-ui/maintab.cpp" line="52"/>
         <source>Cancel</source>
         <translation>Annuler</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>Température de l&apos;air [%1]</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>Température de l&apos;eau [%1]</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>Ce groupe est en train d&apos;être édité.</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>Plusieurs plongées sont en train d&apos;être éditées.</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>Cette plongée est en train d&apos;être éditée.</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>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="494"/>
+        <location filename="../qt-ui/maintab.cpp" line="464"/>
         <source>unknown</source>
         <translation>inconnu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>N</source>
-        <translation>N</translation>
+        <location filename="../qt-ui/maintab.cpp" line="501"/>
+        <source>Deepest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>S</source>
-        <translation>S</translation>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <source>Shallowest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>E</source>
-        <translation>E</translation>
+        <location filename="../qt-ui/maintab.cpp" line="794"/>
+        <source>Discard the Changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>W</source>
-        <translation>O</translation>
+        <location filename="../qt-ui/maintab.cpp" line="795"/>
+        <source>You are about to discard your changes.</source>
+        <translation type="unfinished"/>
     </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>Filtrer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="571"/>
+        <location filename="../qt-ui/mainwindow.ui" line="646"/>
         <source>&amp;File</source>
         <translation>&amp;Fichier</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="583"/>
+        <source>Print</source>
+        <translation>Imprimer</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:'Courier'; 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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
         <source>&amp;Log</source>
         <translation>&amp;Journal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="606"/>
+        <location filename="../qt-ui/mainwindow.ui" line="679"/>
         <source>&amp;View</source>
         <translation>&amp;Vue</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="628"/>
+        <location filename="../qt-ui/mainwindow.ui" line="701"/>
         <source>&amp;Help</source>
         <translation>&amp;Aide</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="636"/>
+        <location filename="../qt-ui/mainwindow.ui" line="709"/>
         <source>&amp;Import</source>
         <translation>&amp;Importer</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>&amp;Nouveau carnet de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="655"/>
+        <location filename="../qt-ui/mainwindow.ui" line="728"/>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="658"/>
+        <location filename="../qt-ui/mainwindow.ui" line="731"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</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>&amp;Ouvrir un carnet de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="666"/>
+        <location filename="../qt-ui/mainwindow.ui" line="739"/>
         <source>Open</source>
         <translation>Ouvrir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <location filename="../qt-ui/mainwindow.ui" line="742"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="674"/>
+        <location filename="../qt-ui/mainwindow.ui" line="747"/>
         <source>&amp;Save</source>
         <translation>Enregistrer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="677"/>
+        <location filename="../qt-ui/mainwindow.ui" line="750"/>
         <source>Save</source>
         <translation>Sauvegarder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="680"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>Save as</source>
         <translation>Enregistrer sous</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>Ctrl+Maj+S</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>&amp;Fermer</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="702"/>
+        <location filename="../qt-ui/mainwindow.ui" line="775"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="902"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <source>P&amp;references</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="831"/>
+        <source>&amp;Add Dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <source>Auto &amp;Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="863"/>
+        <source>&amp;Dive List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="871"/>
+        <source>&amp;Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="879"/>
+        <source>&amp;Info</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="887"/>
+        <source>&amp;All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="895"/>
+        <source>P&amp;rev DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="903"/>
+        <source>&amp;Next DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="911"/>
+        <source>&amp;Select Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <source>&amp;About Subsurface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="937"/>
+        <source>&amp;Globe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="953"/>
+        <source>&amp;Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="959"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="707"/>
-        <source>Export &amp;UDDF</source>
-        <translation>Exporter &amp;UDDF</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="1008"/>
+        <source>&amp;Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1011"/>
+        <source>Export Dive Logs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1014"/>
+        <source>Ctrl+E</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Enable the pN2 Graph</source>
         <translation>Activer le graphique pN2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <location filename="../qt-ui/mainwindow.ui" line="128"/>
         <source>Enable the pHe graph</source>
         <translation>Activer le graphique pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <location filename="../qt-ui/mainwindow.ui" line="290"/>
         <source>Show/hide heart rate</source>
         <translation>Afficher/cacher le rythme cardiaque</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <location filename="../qt-ui/mainwindow.ui" line="342"/>
         <source>Enable EAD, END, and EADD</source>
         <translation>Afficher EAD, END et EADD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="238"/>
         <source>Show NDL / TTS</source>
         <translation>Afficher NDL / TRS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="456"/>
+        <location filename="../qt-ui/mainwindow.ui" line="394"/>
         <source>Rescale depth axis</source>
         <translation>Recalculer l&apos;axe des profondeurs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="710"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="715"/>
-        <source>Export HTML World Map</source>
-        <translation>Exporter la carte mondiale en HTML</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="718"/>
-        <source>Ctrl+H</source>
-        <translation>Ctrl+H</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="723"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>&amp;Print</source>
         <translation>&amp;Imprimer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="734"/>
+        <location filename="../qt-ui/mainwindow.ui" line="791"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="742"/>
+        <location filename="../qt-ui/mainwindow.ui" line="799"/>
         <source>&amp;Quit</source>
         <translation>&amp;Quitter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="753"/>
+        <location filename="../qt-ui/mainwindow.ui" line="810"/>
         <source>Import from &amp;dive computer</source>
         <translation>Importer depuis l&apos;&amp;ordinateur de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="818"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation>Importer les données &amp;GPS depuis le service Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="764"/>
+        <location filename="../qt-ui/mainwindow.ui" line="821"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="826"/>
         <source>&amp;Edit Device Names</source>
         <translation>&amp;Modifier le nom du périphérique</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="834"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="782"/>
+        <location filename="../qt-ui/mainwindow.ui" line="839"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Renuméroter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="785"/>
+        <location filename="../qt-ui/mainwindow.ui" line="842"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="798"/>
+        <location filename="../qt-ui/mainwindow.ui" line="855"/>
         <source>&amp;Yearly Statistics</source>
         <translation>&amp;Statistiques annuelles</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="801"/>
+        <location filename="../qt-ui/mainwindow.ui" line="858"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="806"/>
-        <source>Dive List</source>
-        <translation>Liste de plongées</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="814"/>
-        <source>Profile</source>
-        <translation>Profil</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="822"/>
-        <source>Info</source>
-        <translation>Informations</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="830"/>
-        <source>All</source>
-        <translation>Tout</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="872"/>
+        <location filename="../qt-ui/mainwindow.ui" line="929"/>
         <source>User &amp;Manual</source>
         <translation>Manuel d&apos;utilisation</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="880"/>
-        <source>Globe</source>
-        <translation>Globe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="888"/>
+        <location filename="../qt-ui/mainwindow.ui" line="945"/>
         <source>P&amp;lan Dive</source>
         <translation>P&amp;lannification de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="891"/>
+        <location filename="../qt-ui/mainwindow.ui" line="948"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="907"/>
-        <source>Import from Divelogs.de</source>
-        <translation>Importer depuis divelogs.de</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1003"/>
         <source>&amp;Check for Updates</source>
         <translation>&amp;Chercher les mises à jours</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="951"/>
-        <source>Export CSV</source>
-        <translation>Export en CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="726"/>
+        <location filename="../qt-ui/mainwindow.ui" line="783"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</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>Activer le graphique pO2</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>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="316"/>
         <source>Enable MOD</source>
         <translation>Activer MOD</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>Afficher le plafond signalé par l&apos;ordinateur</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>Afficher le plafond calculé</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>Afficher le plafond calculé avec une hausse de 3m</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>Calculé tous les tissues</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>Afficher le taux de consomation d&apos;air</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>Activer/désactiver la règle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="731"/>
-        <source>Preferences</source>
-        <translation>Préférences</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="745"/>
+        <location filename="../qt-ui/mainwindow.ui" line="802"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="756"/>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="774"/>
-        <source>Add Dive</source>
-        <translation>Ajouter une plongée</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="793"/>
-        <source>Auto Group</source>
-        <translation>Groupement automatique</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="809"/>
+        <location filename="../qt-ui/mainwindow.ui" line="866"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="817"/>
+        <location filename="../qt-ui/mainwindow.ui" line="874"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <location filename="../qt-ui/mainwindow.ui" line="882"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="833"/>
+        <location filename="../qt-ui/mainwindow.ui" line="890"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="838"/>
-        <source>Prev DC</source>
-        <translation>Ordinateur précédent</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="841"/>
+        <location filename="../qt-ui/mainwindow.ui" line="898"/>
         <source>Left</source>
         <translation>Gauche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="846"/>
-        <source>Next DC</source>
-        <translation>Ordinateur suivant</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="849"/>
+        <location filename="../qt-ui/mainwindow.ui" line="906"/>
         <source>Right</source>
         <translation>Droite</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="854"/>
-        <source>Select Events</source>
-        <translation>Sélection des événements</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <location filename="../qt-ui/mainwindow.ui" line="916"/>
         <source>Input Plan</source>
         <translation>Saisir le plan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="864"/>
-        <source>About Subsurface</source>
-        <translation>À propos de Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="875"/>
+        <location filename="../qt-ui/mainwindow.ui" line="932"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="883"/>
+        <location filename="../qt-ui/mainwindow.ui" line="940"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="896"/>
-        <source>Import Log Files</source>
-        <translation>Importer les journaux</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="899"/>
+        <location filename="../qt-ui/mainwindow.ui" line="956"/>
         <source>Import divelog files from other applications</source>
         <translation>Importer les journaux depuis d&apos;autres applications</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="915"/>
+        <location filename="../qt-ui/mainwindow.ui" line="964"/>
+        <source>Import &amp;from Divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="972"/>
         <source>&amp;Full Screen</source>
         <translation>&amp;Plein écran</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>Basculer le plein écran</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <location filename="../qt-ui/mainwindow.ui" line="978"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="174"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
         <source>Open File</source>
         <translation>Ouvrir un Fichier</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>Veuillez enregistrer ou annuler vos modifications en cours avant de fermer le fichier.</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>
-        <translation>Veuillez enregistrer ou annuler vos modifications en cours avant de démarrer une planification.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="396"/>
+        <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>Veuillez enregistrer ou annuler vos modifications en cours avant d&apos;ajouter une nouvelle plongée.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="645"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="419"/>
+        <source>Print runtime table</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="710"/>
         <source>Do you want to save the changes you made in the file %1?</source>
         <translation>Voulez-vous enregistrer les modifications du fichier %1 ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="647"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="712"/>
         <source>Do you want to save the changes you made in the datafile?</source>
         <translation>Voulez-vous enregistrer les modifications du fichier de données ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="652"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="717"/>
         <source>Save Changes?</source>
         <translation>Enregistrement des changements ?</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>Les modifications seront perdues si vous ne les enregistrez pas.</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>Enregistrer le fichier sous</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>Avertissement</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>Veuillez enregistrer ou annuler vos modifications en cours avant d&apos;ouvrir un nouveau fichier.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="280"/>
-        <source>Export UDDF File as</source>
-        <translation>Exporter le fichier UDDF en</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="281"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>Fichiers UDDF (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="289"/>
-        <source>Export CSV File as</source>
-        <translation>Exporter le fichier CSV en</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="290"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>Fichiers CSV (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="299"/>
-        <source>Export World Map</source>
-        <translation>Exporter la carte mondiale</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="300"/>
-        <source>HTML files (*.html)</source>
-        <translation>Fichiers HTML (*.html)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="449"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="514"/>
         <source>Yearly Statistics</source>
         <translation>Statistiques annuelles</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="961"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1076"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Fichiers XML Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1199"/>
         <source>Open Dive Log File</source>
         <translation>Ouvrir un journal de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <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>Journaux de plongée (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;Fichiers XML (*.xml);;Fichiers UDDF/UDCF (uddf *.udcf);;Fichiers JDiveLog (*.jlb);;Fichiers Suunto (*.sde *.db);;Fichier CSV (*.csv);;Tous fichiers(*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1225"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Merci de finir l&apos;édition en cours avant d&apos;en commencer une autre.</translation>
     </message>
 </context>
 <context>
+    <name>PlannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Last stop at 20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="416"/>
+        <source>Last stop at 6m</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>PreferencesDialog</name>
     <message>
         <location filename="../qt-ui/preferences.ui" line="85"/>
@@ -1825,247 +1928,297 @@ Veuillez d&apos;abord les supprimer.</translation>
         <translation>Langue</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="151"/>
         <source>Lists and Tables</source>
         <translation>Listes et Tables</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font</source>
         <translation>Police</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="167"/>
         <source>Font size</source>
         <translation>Taille de police</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="170"/>
+        <location filename="../qt-ui/preferences.ui" line="180"/>
         <source>Dives</source>
         <translation>Plongées</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>Fichier de plongée par défaut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="188"/>
+        <location filename="../qt-ui/preferences.ui" line="198"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="197"/>
+        <location filename="../qt-ui/preferences.ui" line="207"/>
         <source>Display Invalid</source>
         <translation>Afficher invalide</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="214"/>
+        <location filename="../qt-ui/preferences.ui" line="224"/>
         <source>Default Cylinder</source>
         <translation>Bloc par défaut</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>Utiliser le bloc par défaut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <location filename="../qt-ui/preferences.ui" line="247"/>
         <source>Animations</source>
         <translation>Animations</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <location filename="../qt-ui/preferences.ui" line="253"/>
         <source>Speed</source>
         <translation>Vitesse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="270"/>
+        <location filename="../qt-ui/preferences.ui" line="280"/>
         <source>Subsurface Webservice</source>
         <translation>Site web de Subsurface</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>Identifiant de l&apos;utilisateur par défaut</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>Sauvegarder l&apos;identifier de l&apos;utilisateur ?</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="312"/>
+        <source>Reset all settings to their default value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
         <source>System</source>
         <translation>Système</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="348"/>
         <source>Metric</source>
         <translation>Métrique</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="333"/>
+        <location filename="../qt-ui/preferences.ui" line="358"/>
         <source>Imperial</source>
         <translation>Impérial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="343"/>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
         <source>Personalize</source>
         <translation>Personnalisé</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="392"/>
         <source>Depth</source>
         <translation>Profondeur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="374"/>
+        <location filename="../qt-ui/preferences.ui" line="399"/>
         <source>meter</source>
         <translation>mètre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="409"/>
         <source>feet</source>
         <translation>pied</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="401"/>
+        <location filename="../qt-ui/preferences.ui" line="426"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="411"/>
+        <location filename="../qt-ui/preferences.ui" line="436"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="428"/>
+        <location filename="../qt-ui/preferences.ui" line="453"/>
         <source>liter</source>
         <translation>litre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="438"/>
+        <location filename="../qt-ui/preferences.ui" line="463"/>
         <source>cu ft</source>
         <translation>pied cubique</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="455"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="465"/>
+        <location filename="../qt-ui/preferences.ui" line="490"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="482"/>
+        <location filename="../qt-ui/preferences.ui" line="507"/>
         <source>kg</source>
         <translation>kg</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>limite d&apos;affichage de la pO₂</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>limit d&apos;affichage de la pN₂</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>limite d&apos;affichage de la pHe</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="636"/>
-        <source>max ppO₂ when showing MOD</source>
-        <translation>ppO₂ maximale lors de l&apos;affichage de MOD</translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="811"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="817"/>
+        <source>Proxy type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="830"/>
+        <source>Host</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="856"/>
+        <source>Port</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="882"/>
+        <source>Requires authentication</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="657"/>
+        <location filename="../qt-ui/preferences.ui" line="925"/>
+        <source>Password</source>
+        <translation>Mot de passe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="682"/>
         <source>draw dive computer reported ceiling red</source>
         <translation>afficher en rouge le plafond signalé par l&apos;ordinateur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="747"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>System Default</source>
         <translation>Paramètre par défaut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="767"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>Filter</source>
         <translation>Filtrer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="419"/>
         <source>Pressure</source>
         <translation>Pression</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="421"/>
+        <location filename="../qt-ui/preferences.ui" line="446"/>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="448"/>
+        <location filename="../qt-ui/preferences.ui" line="473"/>
         <source>Temperature</source>
         <translation>Température</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="475"/>
+        <location filename="../qt-ui/preferences.ui" line="500"/>
         <source>Weight</source>
         <translation>Poids</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="517"/>
         <source>lbs</source>
         <translation>livre US</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="507"/>
+        <location filename="../qt-ui/preferences.ui" line="532"/>
         <source>Time units</source>
         <translation>Unités de temps</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>Dénominateur de vitesse de montée/descente</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="520"/>
+        <location filename="../qt-ui/preferences.ui" line="545"/>
         <source>Minutes</source>
         <translation>Minutes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="530"/>
+        <location filename="../qt-ui/preferences.ui" line="555"/>
         <source>Seconds</source>
         <translation>Secondes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="562"/>
+        <location filename="../qt-ui/preferences.ui" line="587"/>
         <source>Show</source>
         <translation>Montrer</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="693"/>
         <source>Show non-used cylinders in Equipment Tab</source>
         <translation>Afficher les blocs non-utilisé dans l&apos;onglet de l&apos;équipement</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>afficher profondeur moyenne</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>GFLow à la profondeur max</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="691"/>
+        <location filename="../qt-ui/preferences.ui" line="716"/>
         <source>Misc</source>
         <translation>Divers</translation>
     </message>
@@ -2075,35 +2228,65 @@ Veuillez d&apos;abord les supprimer.</translation>
         <translation>Préférences</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="697"/>
+        <location filename="../qt-ui/preferences.ui" line="722"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="739"/>
         <source>GFHigh</source>
         <translation>GFHigh</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="24"/>
+        <source>System proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="25"/>
+        <source>HTTP proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="26"/>
+        <source>SOCKS proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="245"/>
         <source>Restart required</source>
         <translation>Redémarrage necessaire</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>Vous devez redémarrer Subsurface pour prendre en compte la nouvelle langue.</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>Ouvrir le fichier de plongée par défaut</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>Fichiers XML Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="394"/>
+        <source>Warning</source>
+        <translation>Avertissement</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"/>
+    </message>
 </context>
 <context>
     <name>PrintDialog</name>
@@ -2244,72 +2427,72 @@ Veuillez d&apos;abord les supprimer.</translation>
 <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>inconnu</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>Plongée #%1 - %2</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>Profondeur max: %1 %2</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>Durée: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1918"/>
+        <location filename="../qt-ui/models.cpp" line="1898"/>
         <source>Gas Used:</source>
         <translation>Gaz utilisé:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1920"/>
+        <location filename="../qt-ui/models.cpp" line="1900"/>
         <source>SAC:</source>
         <translation>Consommation d&apos;air:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1922"/>
+        <location filename="../qt-ui/models.cpp" line="1902"/>
         <source>Max. CNS:</source>
         <translation>SNC Max.:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1924"/>
+        <location filename="../qt-ui/models.cpp" line="1904"/>
         <source>Weights:</source>
         <translation>Poids:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1929"/>
+        <location filename="../qt-ui/models.cpp" line="1909"/>
         <source>Notes:</source>
         <translation>Notes:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1936"/>
+        <location filename="../qt-ui/models.cpp" line="1916"/>
         <source>Divemaster:</source>
         <translation>Chef de palanquée:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1938"/>
+        <location filename="../qt-ui/models.cpp" line="1918"/>
         <source>Buddy:</source>
         <translation>Binôme:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1940"/>
+        <location filename="../qt-ui/models.cpp" line="1920"/>
         <source>Suit:</source>
         <translation>Combinaison:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1942"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>Viz:</source>
         <translation>Visi:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1944"/>
+        <location filename="../qt-ui/models.cpp" line="1924"/>
         <source>Rating:</source>
         <translation>Évaluation:</translation>
     </message>
@@ -2317,62 +2500,77 @@ Veuillez d&apos;abord les supprimer.</translation>
 <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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/>
+        <source>Make first divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="906"/>
+        <source>Delete this divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="913"/>
         <source>Add Gas Change</source>
         <translation>Ajouter un changement de mélange</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>Ajouter un signet</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>Supprimer l&apos;événement</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>Cacher les événements similaires</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>Modifier le nom</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>Dé-sélectionner tous les évènements</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>Cacher les événements</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>Cacher tous les événements %1 ?</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>Supprimer l&apos;événement sélectionné ?</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>%1 @ %2:%3</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>Modifier le nom du marque-page</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>Nom personnalisé :</translation>
     </message>
@@ -2380,12 +2578,12 @@ Veuillez d&apos;abord les supprimer.</translation>
 <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>AIR</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>Supprimer ce point</translation>
     </message>
@@ -2395,22 +2593,22 @@ Veuillez d&apos;abord les supprimer.</translation>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="34"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation>Moyenne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="37"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="40"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation>Maximum</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>Déplacez la carte et double cliquez pour définir le lieu de la plongée</translation>
     </message>
@@ -2424,9 +2622,23 @@ Veuillez d&apos;abord les supprimer.</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="128"/>
         <source>New starting number</source>
         <translation>Nouveau numéro de départ</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="126"/>
+        <source>New number</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchBar</name>
+    <message>
+        <location filename="../qt-ui/searchbar.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ShiftImageTimesDialog</name>
@@ -2441,42 +2653,47 @@ Veuillez d&apos;abord les supprimer.</translation>
         <translation>Décalé l&apos;heure des images par</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="102"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="95"/>
+        <source>h:mm</source>
+        <translation>h:mm</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="105"/>
         <source>earlier</source>
         <translation>plus tôt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="109"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="112"/>
         <source>later</source>
         <translation>plus tard</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>Pour calculer le décalage entre l&apos;horloge de votre ordinateur de plongée et celle de votre appareil photo, prenez une photo avec votre appareil photo de votre ordinateur de plongée affichant l&apos;heure. Télécharger cette image sur votre ordinateur et appuyez sur ce bouton.</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>Déterminer l&apos;écart avec l&apos;appareil photo</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>Sélectionner une image de l&apos;ordinateur de plongée montrant l&apos;heure</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>Quelle est l&apos;heure et la date affiché par l&apos;image?</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>Ouvir fichier image</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>Fichiers image (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2556,42 +2773,42 @@ Veuillez d&apos;abord les supprimer.</translation>
 <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>Serveur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/>
         <source>Connecting...</source>
         <translation>Connexion en cours...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="421"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="419"/>
         <source>Download finished</source>
         <translation>Téléchargement terminé</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>Erreur de téléchargement: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/>
         <source>Connection Error: </source>
         <translation>Erreur de connexion : </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>Identifiant utilisateur incorrect.</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>Impossible de lire la réponse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/>
         <source>Download Success!</source>
         <translation>Téléchargement réussi</translation>
     </message>
@@ -2607,17 +2824,17 @@ Veuillez d&apos;abord les supprimer.</translation>
 <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>Description</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2625,7 +2842,7 @@ Veuillez d&apos;abord les supprimer.</translation>
 <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>Information</translation>
     </message>
@@ -2633,42 +2850,42 @@ Veuillez d&apos;abord les supprimer.</translation>
 <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>Cherche les mises à jours.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="37"/>
-        <source>&lt;h3&gt;Subsurface was unable to check for updates.&lt;/h3&gt;</source>
-        <translation>&lt;h3&gt;Subsurface n&apos;a pu cherché les mises à jours.&lt;/h3&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="36"/>
+        <source>Subsurface was unable to check for updates.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
-        <source>&lt;br/&gt;&lt;b&gt;The following error occurred:&lt;/b&gt;&lt;br/&gt;</source>
-        <translation>&lt;br/&gt;&lt;b&gt;L&apos;erreur suivante s&apos;est produite:&lt;/b&gt;&lt;br/&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="41"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="43"/>
-        <source>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Please check your internet connection.&lt;/b&gt;</source>
-        <translation>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Vérifier votre connexion internet.&lt;/b&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
     </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>Vous utilisez la dernière version de Subsurface.</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>Une nouvelle version de Subsurface est disponible.&lt;br/&gt;Téléchargez-là à&lt;/br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="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>&lt;b&gt;Une nouvelle version de Subsurface est disponible.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</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>Il y a eu une erreur lors de la recherche des mises à jours.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -2676,25 +2893,163 @@ Veuillez d&apos;abord les supprimer.</translation>
 <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>Manuel utilisateur</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>Impossible de trouver le manuel de Subsurface</translation>
     </message>
 </context>
 <context>
+    <name>UserSurvey</name>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="47"/>
+        <source>Subsurface User Survey</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="79"/>
+        <source>Recreational DIver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="92"/>
+        <source>Tech Diver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="105"/>
+        <source>Interested in dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="118"/>
+        <source>I am downloading dives from supported dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="131"/>
+        <source>I am importing dives from other software / sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="144"/>
+        <source>I am manually entering dives</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="190"/>
+        <source>Please type suggestions (in English) in the following box</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="27"/>
+        <source>
+Operating System: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="30"/>
+        <source>
+CPU Architecture: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="35"/>
+        <source>
+OS CPU Architecture %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="39"/>
+        <source>
+Language: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="73"/>
+        <source>Should we ask you later?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="74"/>
+        <source>Don&apos;t ask me again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="75"/>
+        <source>Ask Later</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="76"/>
+        <source>Ask again?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <source>Submit User Survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <source>Subsurface was unable to submit the user survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="101"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="102"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="111"/>
+        <source>Survey successfully submitted.</source>
+        <translation type="unfinished"/>
+    </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>Il y a eu une erreur lors de la recherche des mises à jours.&lt;br/&gt;&lt;br/&gt;%1</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>Description</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="723"/>
+        <location filename="../qt-ui/models.cpp" line="721"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2742,12 +3097,12 @@ Veuillez d&apos;abord les supprimer.</translation>
         <translation>Envoyer</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>Temps de réponse dépassé pour l&apos;opération</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="279"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="277"/>
         <source>Transfering data...</source>
         <translation>Transfert des données en cours</translation>
     </message>
@@ -2755,37 +3110,37 @@ Veuillez d&apos;abord les supprimer.</translation>
 <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</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="368"/>
+        <location filename="../qt-ui/models.cpp" line="373"/>
         <source>Weight</source>
         <translation>Poids</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>Cliquer ici retirera ce système de poids.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="453"/>
+        <location filename="../qt-ui/models.cpp" line="458"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="454"/>
+        <location filename="../qt-ui/models.cpp" line="459"/>
         <source>lbs</source>
         <translation>livre US</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="478"/>
+        <location filename="../qt-ui/models.cpp" line="483"/>
         <source>ft</source>
         <translation>pied</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="484"/>
         <source>m</source>
         <translation>m</translation>
     </message>
@@ -2793,79 +3148,79 @@ Veuillez d&apos;abord les supprimer.</translation>
 <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>Année
 &gt; Mois / Groupe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>#</source>
         <translation>N°</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1643"/>
         <source>Duration 
  Total</source>
         <translation>Durée
 Totale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>
 Average</source>
         <translation>
 Moyenne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>
 Shortest</source>
         <translation>
 Plus courte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>
 Longest</source>
         <translation>
 Plus longue</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>Pronfondeur (%&amp;)
 Moyenne</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>
 Minimum</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>
 Maximum</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>SAC (%1)
 Moyenne</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>Temp. (%1)
@@ -2875,99 +3230,92 @@ Moyenne</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="58"/>
+        <location filename="../dive.c" line="87"/>
         <source>pascal</source>
         <translation>pascal</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>bar</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>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="104"/>
-        <location filename="../qt-gui.cpp" line="292"/>
-        <source>l</source>
-        <translation>l</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>pied³</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>m</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>pied</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>livre US</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>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1120"/>
+        <location filename="../dive.c" line="1237"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) ou (%s)</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>air</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="170"/>
+        <location filename="../equipment.c" line="210"/>
         <source>integrated</source>
         <translation>intégré</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="171"/>
+        <location filename="../equipment.c" line="211"/>
         <source>belt</source>
         <translation>ceinture</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="172"/>
+        <location filename="../equipment.c" line="212"/>
         <source>ankle</source>
         <translation>cheville</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="173"/>
+        <location filename="../equipment.c" line="213"/>
         <source>backplate weight</source>
         <translation>poids dorsaux</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="174"/>
+        <location filename="../equipment.c" line="214"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -2984,253 +3332,253 @@ Moyenne</translation>
         <translation>Le nombre maximal de colonnes supporté pour les importations de fichiers CSV est %d.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>none</source>
         <translation>aucun</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>deco stop</source>
         <translation>Arrêt de décompression</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ascent</source>
         <translation>ascension</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ceiling</source>
         <translation>plafond</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>workload</source>
         <translation>charge</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>transmitter</source>
         <translation>transmetteur</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>violation</source>
         <translation>violation</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>bookmark</source>
         <translation>marque-page</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>surface</source>
         <translation>surface</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>safety stop</source>
         <translation>palier de sécurité</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>Changement de gas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (voluntary)</source>
         <translation>palier de sécurité (volontaire)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (mandatory)</source>
         <translation>palier de sécurité (obligatoire)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>deepstop</source>
         <translation>Arrêt profond</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>ceiling (safety stop)</source>
         <translation>plafond (palier de sécurité)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>divetime</source>
         <translation>Temps de plongée</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>sous profondeur plancher</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>maxdepth</source>
         <translation>profondeur max</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>airtime</source>
         <translation>temps d&apos;air</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>heading</source>
         <translation>entête</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>tissue level warning</source>
         <translation>Avertissement de niveau « tissue »</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>non stop time</source>
         <translation>temps sans arrêt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="163"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>invalid event number</source>
         <translation>numéro d&apos;événement non valide</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>Impossible de créer une analyse pour %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="411"/>
+        <location filename="../libdivecomputer.c" line="414"/>
         <source>Error registering the data</source>
         <translation>Impossible d&apos;enregistrer les données</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="419"/>
+        <location filename="../libdivecomputer.c" line="422"/>
         <source>Error parsing the datetime</source>
         <translation>Impossible d&apos;analyser l&apos;heure</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="438"/>
         <source>Dive %d: %s %d %04d</source>
         <translation>Plongée n°%d - %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="440"/>
+        <location filename="../libdivecomputer.c" line="443"/>
         <source>Error parsing the divetime</source>
         <translation>Impossible d&apos;analyser le temps de plongée</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="449"/>
+        <location filename="../libdivecomputer.c" line="452"/>
         <source>Error parsing the maxdepth</source>
         <translation>Impossible d&apos;analyser la profondeux maximale</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="458"/>
+        <location filename="../libdivecomputer.c" line="461"/>
         <source>Error parsing the gas mix count</source>
         <translation>Impossible d&apos;analyser le nombre de mélange gazeux</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="470"/>
+        <location filename="../libdivecomputer.c" line="473"/>
         <source>Error obtaining water salinity</source>
         <translation>Impossible d&apos;obtenir la salinité de l&apos;eau</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error obtaining surface pressure</source>
         <translation>Erreur à l&apos;obtention de la pression en surface</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the gas mix</source>
         <translation>Impossible d&apos;analyser le mélange gazeux</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="493"/>
+        <location filename="../libdivecomputer.c" line="496"/>
         <source>Error parsing the samples</source>
         <translation>Impossible d&apos;analyser des échantillons</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="623"/>
+        <location filename="../libdivecomputer.c" line="626"/>
         <source>Event: waiting for user action</source>
         <translation>Événement : attente d&apos;une action de l&apos;utilisateur</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="631"/>
+        <location filename="../libdivecomputer.c" line="634"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>modèle = %u (0x%08x), firmware = %u (0x%08x), port série = %u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="691"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the event handler.</source>
         <translation>Impossible d&apos;enregistrer le gestionnaire d&apos;événement.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="696"/>
+        <location filename="../libdivecomputer.c" line="699"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Impossible d&apos;enregistrer le gestionnaire d&apos;annulation.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="717"/>
+        <location filename="../libdivecomputer.c" line="720"/>
         <source>Dive data import error</source>
         <translation>Erreur à l&apos;import des données de plongées</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="756"/>
+        <location filename="../libdivecomputer.c" line="759"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Impossible de créer un contexte libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="763"/>
+        <location filename="../libdivecomputer.c" line="766"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Impossible d&apos;ouvrir %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="462"/>
+        <location filename="../parse-xml.c" line="466"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Valeur de pourcentage étrange %s
 </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>Impossible d&apos;analyser « %s »</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>Échec de la requête.
 </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>Errur de la requête get_tags.
@@ -3244,111 +3592,160 @@ Moyenne</translation>
 </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 '%s'.
 </source>
         <translation>Échec de la requête &apos;%s&apos;.
 </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>Erreur de la requête get_cylinders.
 </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>Erreur de la requête get_changes.
 </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>Erreur de la requête get_profile_sample.
 </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>Impossible d&apos;ouvrir le feuille de style %s</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>Nitrox%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="146"/>
-        <location filename="../planner.c" line="617"/>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation>Impossible de trouver le gaz %d/%d</translation>
+        <location filename="../planner.c" line="159"/>
+        <location filename="../planner.c" line="752"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="308"/>
+        <location filename="../planner.c" line="345"/>
         <source>Too many gas mixes</source>
         <translation>Trop de gaz différents</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="489"/>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation>%s
-Subsurface sumilation de plongée
-basé sur un GFlow = %.0f et un GFhigh = %.0f
-
-</translation>
+        <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>ATTENTION : CECI EST UNE NOUVELLE IMPLÉMENTATION DE L&apos;ALGORITHME DE BUHLMANN ET LE SIMULATEUR DE PLONGÉE N&apos;A ÉTÉ TESTÉ QUE SOMMAIREMENT. IL EST FORTEMENT CONSEILLÉ DE NE PAS PLONGER EN SE BASANT UNIQUEMENT SUR LES INDICATIONS FOURNIES ICI.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="530"/>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Transition vers %.*f %s en %d:%02d min - temps %d:%02u sur %s
-</translation>
+        <location filename="../planner.c" line="535"/>
+        <source>based on GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="539"/>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Rester à %.*f %s pour %d:%02d min - temps %d:%02u sur %s
-</translation>
+        <location filename="../planner.c" line="538"/>
+        <source>Subsurface dive plan</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="550"/>
-        <source>Switch gas to %s
-</source>
-        <translation>Changer pour du gaz %s
-</translation>
+        <location filename="../planner.c" line="542"/>
+        <source>depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="558"/>
-        <source>Gas consumption:
-</source>
-        <translation>Consommation de gaz :
-</translation>
+        <location filename="../planner.c" line="545"/>
+        <source>runtime</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="569"/>
-        <source>%.0f%s of %s
-</source>
-        <translation>%.0f%s de %s
-</translation>
+        <location filename="../planner.c" line="548"/>
+        <source>duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="551"/>
+        <source>gas</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="606"/>
+        <source>%3.0f%s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
+        <source>%3dmin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="629"/>
+        <source>Switch gas to %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="638"/>
+        <source>Gas consumption:</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="659"/>
+        <source>this is more gas than available in the specified cylinder!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="810"/>
+        <location filename="../planner.c" line="664"/>
+        <source>not enough reserve for gas sharing on ascent!</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="668"/>
+        <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="980"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1226"/>
+        <location filename="../profile.c" line="1250"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3357,70 +3754,69 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1229"/>
+        <location filename="../profile.c" line="1253"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1233"/>
+        <location filename="../profile.c" line="1257"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1263"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </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>CAS: %2.1fl/min
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1244"/>
+        <location filename="../profile.c" line="1268"/>
         <source>CNS: %u%%
 </source>
         <translation>SNC : %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1246"/>
+        <location filename="../profile.c" line="1270"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1272"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="1274"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="1277"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD : %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1260"/>
+        <location filename="../profile.c" line="1284"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3429,7 +3825,7 @@ EADD : %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1264"/>
+        <location filename="../profile.c" line="1288"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3438,402 +3834,395 @@ EADD : %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1276"/>
+        <location filename="../profile.c" line="1300"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Arrêt de sécurité: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1279"/>
+        <location filename="../profile.c" line="1303"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Arrêt de sécurité: temps inconnu @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="1308"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Déco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
+        <location filename="../profile.c" line="1311"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Déco: temps inconnu @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1291"/>
+        <location filename="../profile.c" line="1315"/>
         <source>In deco
 </source>
         <translation>Déco
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1293"/>
+        <location filename="../profile.c" line="1317"/>
         <source>NDL: %umin
 </source>
         <translation>NDL : %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1297"/>
+        <location filename="../profile.c" line="1321"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Déco: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1305"/>
+        <location filename="../profile.c" line="1329"/>
         <source>In deco (calc)
 </source>
         <translation>Déco (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1307"/>
+        <location filename="../profile.c" line="1331"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>LND:%umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1310"/>
+        <location filename="../profile.c" line="1334"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TRS:%umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1313"/>
+        <location filename="../profile.c" line="1337"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Plafond calculé %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1319"/>
+        <location filename="../profile.c" line="1343"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Tissue %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1325"/>
+        <location filename="../profile.c" line="1349"/>
         <source>heartbeat: %d
 </source>
         <translation>rythme cardiaque: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1327"/>
+        <location filename="../profile.c" line="1351"/>
         <source>bearing: %d
 </source>
         <translation>palié: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1419"/>
+        <location filename="../profile.c" line="1443"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</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>%s %sPd:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1435"/>
+        <location filename="../profile.c" line="1459"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sPd:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1439"/>
+        <location filename="../profile.c" line="1463"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</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>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1454"/>
+        <location filename="../profile.c" line="1478"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="273"/>
+        <location filename="../qt-gui.cpp" line="281"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="276"/>
+        <location filename="../qt-gui.cpp" line="284"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="392"/>
-        <source>%1, %2 %3, %4 %5:%6</source>
-        <translation>%1, %2 %3, %4 %5:%6</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="405"/>
-        <source>%1 %2, %3
-%4:%5</source>
-        <translation>%1 %2, %3
-%4:%5</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="418"/>
+        <location filename="../qt-gui.cpp" line="417"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 plongées)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="423"/>
+        <location filename="../qt-gui.cpp" line="422"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 plongée)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>boat</source>
         <translation>bateau</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>shore</source>
         <translation>rivage</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>drift</source>
         <translation>dérivante</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>deep</source>
         <translation>profondeur</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>cavern</source>
         <translation>grotte</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>ice</source>
         <translation>glace</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>wreck</source>
         <translation>épave</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>cave</source>
         <translation>grotte</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>altitude</source>
         <translation>altitude</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>pool</source>
         <translation>piscine</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>lake</source>
         <translation>Lac</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>river</source>
         <translation>rivière</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>night</source>
         <translation>nuit</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>fresh</source>
         <translation>eau douce</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>student</source>
         <translation>étudiant</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>photo</source>
         <translation>photo</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>video</source>
         <translation>vidéo</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>instructor</source>
         <translation>instructeur</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="25"/>
         <source>deco</source>
         <translation>décompression</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="216"/>
+        <location filename="../dive.c" line="133"/>
+        <source>ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="214"/>
         <source>more than %d days</source>
         <translation>plus de %d jours</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="220"/>
         <source>%dd %dh %dmin</source>
         <translation>%d j %d h %d min</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="224"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dh %dmin</source>
         <translation>%d h %d min</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="235"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation>pour les plongées n°</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="242"/>
+        <location filename="../statistics.c" line="240"/>
         <source>for selected dives</source>
         <translation>uniquement les plongées sélectionnées</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="275"/>
         <source>for dive #%d</source>
         <translation>pour la plongée n°%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for selected dive</source>
         <translation>uniquement la plongée sélectionnée</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for all dives</source>
         <translation>pour toutes les plongées</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="283"/>
+        <location filename="../statistics.c" line="281"/>
         <source>(no dives)</source>
         <translation>(pas de plongées)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sun</source>
         <translation>Dim.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Mon</source>
         <translation>Lun.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Tue</source>
         <translation>Mar.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Wed</source>
         <translation>Mer.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Thu</source>
         <translation>Jeu.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Fri</source>
         <translation>Ven.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sat</source>
         <translation>Sam.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jan</source>
         <translation>Janv.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Feb</source>
         <translation>Fév.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Mar</source>
         <translation>Mar.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Apr</source>
         <translation>Avril</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jun</source>
         <translation>Juin</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Jul</source>
         <translation>Juil.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Aug</source>
         <translation>Août</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Sep</source>
         <translation>Sept.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Oct</source>
         <translation>Oct.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Nov</source>
         <translation>Nov.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Dec</source>
         <translation>Déc.</translation>
     </message>
@@ -3863,97 +4252,97 @@ Is the Uemis Zurich plugged in correctly?</source>
 Est-ce que votre Uemis Zurich est branché correctement ?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="107"/>
+        <location filename="../uemis-downloader.c" line="111"/>
         <source>unknown</source>
         <translation>inconnu</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="379"/>
+        <location filename="../uemis-downloader.c" line="383"/>
         <source>Reading %s %s</source>
         <translation>Lecture %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="399"/>
+        <location filename="../uemis-downloader.c" line="403"/>
         <source>data</source>
         <translation>données</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="420"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>divelog entry id</source>
         <translation>identifiant de l&apos;entrée dans le journal</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="422"/>
+        <location filename="../uemis-downloader.c" line="426"/>
         <source>divespot data id</source>
         <translation>identifiant du site de plongée</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
+        <location filename="../uemis-downloader.c" line="428"/>
         <source>more data dive id</source>
         <translation>plus d&apos;identifiants de plongée</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>wetsuit</source>
         <translation>combinaison humide</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>semidry</source>
         <translation>semi-étanche</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>drysuit</source>
         <translation>Combinaison sèche</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>shorty</source>
         <translation>shorty</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>vest</source>
         <translation>veste</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>long john</source>
         <translation>salopette de combinaison</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>jacket</source>
         <translation>gilet</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>full suit</source>
         <translation>Combinaison intégrale</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>2 pcs full suit</source>
         <translation>Combi 2 pièces</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="620"/>
+        <location filename="../uemis-downloader.c" line="624"/>
         <source>membrane</source>
         <translation>membrane</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="802"/>
+        <location filename="../uemis-downloader.c" line="823"/>
         <source>Init Communication</source>
         <translation>Initialisation de la communication</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="804"/>
+        <location filename="../uemis-downloader.c" line="825"/>
         <source>Uemis init failed</source>
         <translation>Impossible d&apos;initialiser Uemis</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="815"/>
+        <location filename="../uemis-downloader.c" line="836"/>
         <source>Start download</source>
         <translation>Début du téléchargement</translation>
     </message>
@@ -3974,18 +4363,18 @@ Est-ce que votre Uemis Zurich est branché correctement ?</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="203"/>
-        <source>PO2 Green Warning</source>
-        <translation>Avertissement PO2 Vert</translation>
+        <source>pO₂ Green Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
-        <source>PO2 Ascend Warning</source>
-        <translation>Avertissement PO2 ascendant</translation>
+        <source>pO₂ Ascend Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="208"/>
-        <source>PO2 Ascend Alarm</source>
-        <translation>Alarme PO2 ascendant</translation>
+        <source>pO₂ Ascend Alarm</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
@@ -4047,5 +4436,214 @@ Est-ce que votre Uemis Zurich est branché correctement ?</translation>
         <source>Low Battery Alert</source>
         <translation>Alarme de batterie faible</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"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="36"/>
+        <source>Date:</source>
+        <translation>Date :</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="38"/>
+        <source>Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="40"/>
+        <source>Duration:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="41"/>
+        <source>min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="43"/>
+        <source>Max Depth:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="46"/>
+        <source>Air Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="48"/>
+        <source>Water Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="50"/>
+        <source>Location:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="54"/>
+        <source>Notes:</source>
+        <translation>Notes:</translation>
+    </message>
+</context>
+<context>
+    <name>plannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="35"/>
+        <source>Rates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="56"/>
+        <source>Ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="77"/>
+        <source>below 75% avg. depth</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="94"/>
+        <source>75%-50% avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="111"/>
+        <source>50% avg. depth - 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="128"/>
+        <source>6m/20ft to surface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="148"/>
+        <source>Descent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="200"/>
+        <source>surface to the bottom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="226"/>
+        <source>Planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="247"/>
+        <source>GF low</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="264"/>
+        <source>GF high</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
+        <source>Drop to first depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
+        <source>Last Stop at 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>plan backgas breaks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="318"/>
+        <source>Gas Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <source>bottom SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="349"/>
+        <source>deco SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="359"/>
+        <source>bottom pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="389"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="382"/>
+        <source>deco pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="421"/>
+        <source>Dive Notes</source>
+        <translation>Notes de plongée</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="445"/>
+        <source>display runtime</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="458"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="461"/>
+        <source>display segment duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="471"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="474"/>
+        <source>display transitions in deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="481"/>
+        <source>verbatim diveplan</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_he.ts b/translations/subsurface_he.ts
index f4141477a..ad7c333a8 100644
--- a/translations/subsurface_he.ts
+++ b/translations/subsurface_he.ts
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="he">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="he" version="2.0">
+<defaultcodec>UTF-8</defaultcodec>
 <context>
     <name>CylindersModel</name>
     <message>
@@ -31,7 +30,7 @@
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
         <source>He%</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
@@ -39,42 +38,42 @@
         <translation>O</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="507"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="508"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="527"/>
+        <location filename="../qt-ui/models.cpp" line="532"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="528"/>
+        <location filename="../qt-ui/models.cpp" line="533"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -101,213 +100,349 @@
 <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>דגם</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Device ID</source>
         <translation>מזהה התקן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Nickname</source>
         <translation>כינוי</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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="90"/>
-        <source>air</source>
-        <translation>אוויר</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="92"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</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>מעבר חרום למערכת נשימה פתוחה</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>להתחיל</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>סוף</translation>
     </message>
 </context>
 <context>
-    <name>DiveGasPressureItem</name>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="475"/>
-        <source>air</source>
-        <translation>אוויר</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="476"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-</context>
-<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1258"/>
-        <source> l/min</source>
-        <translation>ליטר לדקה</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
-        <source> cuft/min</source>
-        <translation>רגל מעוקב לדקה</translation>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <source>/min</source>
+        <translation>לדקה</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>הצג חיפוש</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="706"/>
         <source>expand all</source>
         <translation>הצג הכל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="740"/>
+        <location filename="../qt-ui/divelistview.cpp" line="707"/>
         <source>collapse all</source>
         <translation>הסתר הכל</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="754"/>
+        <location filename="../qt-ui/divelistview.cpp" line="736"/>
         <source>delete dive(s)</source>
         <translation>מחיקת צלילה/צלילות</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>לא להתחשב בצלילות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
-        <source>save As</source>
-        <translation>שמור בשם</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="744"/>
+        <source>renumber dive(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="763"/>
-        <source>export As UDDF</source>
-        <translation>יצוא כקובץ UDDF</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <source>shift times</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="764"/>
-        <source>export As CSV</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <source>load images</source>
+        <translation>לטעון תמונות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="765"/>
-        <source>shift times</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Open Image Files</source>
+        <translation>פתך קובץ תמונה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="766"/>
-        <source>load images</source>
-        <translation>לטעון תמונות</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation>קבצי תמונה (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <source>merge selected dives</source>
+        <translation>אחד צלילות נבחרות</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="24"/>
+        <source>General Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="30"/>
+        <source>Export format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="42"/>
+        <source>Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="61"/>
+        <source>UDDF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="74"/>
+        <source>divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="84"/>
+        <source>CSV</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="94"/>
+        <source>Worldmap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="107"/>
+        <source>Selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="116"/>
+        <source>Selected dives</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="769"/>
-        <source>upload dive(s) to divelogs.de</source>
-        <translation>העלה צלילות לאתר divelogs.de</translation>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="126"/>
+        <source>All dives</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="795"/>
-        <source>Save Dives As...</source>
-        <translation>שמור צלילות בשם...</translation>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="178"/>
+        <source>HTML</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="814"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="184"/>
+        <source>General Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="190"/>
+        <source>Subsurface Numbers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="203"/>
+        <source>Selected Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="216"/>
+        <source>Minimum Javascript</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="229"/>
+        <source>All Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="239"/>
+        <source>Export List only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="252"/>
+        <source>Style Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="264"/>
+        <source>Font</source>
+        <translation>גופן</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="274"/>
+        <source>Font size</source>
+        <translation>גודל גופן</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
+        <source>8</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <source>10</source>
+        <translation>10</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <source>12</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <source>14</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <source>16</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <source>18</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <source>20</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="323"/>
+        <source>Theme</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <source>Sand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="153"/>
         <source>Export UDDF File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>UDDF קבצי (*.uddf *.UDDF)</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Open Image Files</source>
-        <translation>פתך קובץ תמונה</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="162"/>
+        <source>Export World Map</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
-        <translation>קבצי תמונה (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="163"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="177"/>
+        <source>HTML files (*.html)</source>
+        <translation>קבצי HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="760"/>
-        <source>merge selected dives</source>
-        <translation>אחד צלילות נבחרות</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="167"/>
+        <source>Export Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="168"/>
+        <source>XML files (*.xml *.ssrf)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="176"/>
+        <source>Export HTML files as</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -315,141 +450,136 @@
     <message>
         <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
         <source>Import dive log file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="80"/>
         <source>Depth</source>
         <translation>עומק</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="107"/>
         <source>PO2</source>
         <translation>PO2</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>זמן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="121"/>
         <source>Temp</source>
         <translation>טמפ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="151"/>
         <source>Cns</source>
         <translation>רעילות שייורית מקסימלית</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>יחידות</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>מידה</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>אמריקאית</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="317"/>
         <source>Date</source>
         <translation>תאריך</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="385"/>
         <source>Duration</source>
         <translation>משך הצלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="470"/>
         <source>Tags</source>
         <translation>תגיות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
         <source>Location</source>
         <translation>מיקום</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="368"/>
         <source>Buddy</source>
         <translation>בן זוג</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="402"/>
         <source>Notes</source>
         <translation>הערות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="436"/>
         <source>Weight</source>
         <translation>משקל</translation>
     </message>
@@ -457,105 +587,70 @@
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="71"/>
-        <source>Bottom SAC</source>
-        <translation>צריכת גז בעומק מירבי</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="106"/>
+        <source>Planned Dive Time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="85"/>
-        <source>SAC on DECO Stop</source>
-        <translation>צריכת גז בעצירת דקומפרסיה</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="134"/>
+        <source>Altitude</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="78"/>
-        <source>GFHigh</source>
-        <translation>גרדיאנט עליון</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="98"/>
-        <source>GFLow</source>
-        <translation>גרדיאנט תחתון</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="125"/>
-        <source>Last Stop at 6m</source>
-        <translation>עצירה אחרונה ב6 מ&apos;</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="174"/>
-        <source>Start Time</source>
-        <translation>זמן התחלה</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="181"/>
+        <location filename="../qt-ui/diveplanner.ui" line="141"/>
         <source>ATM Pressure</source>
         <translation>לחץ (אטמ)</translation>
     </message>
-</context>
-<context>
-    <name>DivePlannerGraphics</name>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="114"/>
-        <source>10m</source>
-        <translation>10m</translation>
-    </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="116"/>
-        <source>30ft</source>
-        <translation>30 רגל</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="148"/>
+        <source>mbar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="363"/>
-        <source>Handler Position Error</source>
-        <translation>שגיאת מיקום</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>
-        <translation>עצירה אחת או יותר יאבדו בפעולה זו
-אנא הסירו אותם קודם</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="158"/>
+        <source>m</source>
+        <translation>מטר</translation>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="445"/>
-        <source>AIR</source>
-        <translation>אוויר</translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="137"/>
+        <source>unknown</source>
+        <translation>לא ידוע</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1148"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="586"/>
         <source>Final Depth</source>
         <translation>עומק מירבי</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1152"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="590"/>
         <source>Duration</source>
         <translation>משך הצלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1154"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="592"/>
         <source>Used Gas</source>
         <translation>אוויר שנוצל</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1391"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="887"/>
         <source>Discard the Plan?</source>
         <translation>למחוק תוכנית?</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>אזהרה, אתם עומדים למחוק תוכנית צלילה.</translation>
     </message>
@@ -563,19 +658,19 @@ 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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -603,118 +698,118 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/>
         <source>Color</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
         <source>User Entered</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
         <source>Cylinder Index</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
-        <source>Pressure  S</source>
-        <translation type="unfinished"></translation>
+        <source>Pressure S</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <source>pN₂</source>
+        <translation>pN₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>pHe</source>
+        <translation>לחץ הליום</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Pressure I</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
         <source>Ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
         <source>SAC</source>
         <translation>צריכת אויר</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
-        <source>PN2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <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="119"/>
-        <source>PO2</source>
-        <translation>PO2</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>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>date</source>
         <translation>תאריך</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>m</source>
         <translation>מטר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>ft</source>
         <translation>רגל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1298"/>
         <source>min</source>
         <translation>דקה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>kg</source>
         <translation>קילוגרם</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>lbs</source>
         <translation>ליברה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
+        <location filename="../qt-ui/models.cpp" line="1307"/>
         <source>suit</source>
         <translation>חליפה</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1344"/>
+        <location filename="../qt-ui/models.cpp" line="1325"/>
         <source>location</source>
         <translation>מיקום</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1316"/>
         <source>SAC</source>
         <translation>צריכת אוויר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1338"/>
+        <location filename="../qt-ui/models.cpp" line="1319"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1341"/>
+        <location filename="../qt-ui/models.cpp" line="1322"/>
         <source>maxCNS</source>
         <translation>רעילות שייורית מקסימלית</translation>
     </message>
@@ -722,115 +817,115 @@ 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>תגובה לא חוקית מהשרת</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>
+        <translation type="unfinished"/>
     </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>תג XML הצפוי &apos;DiveDates&apos; לא נמצא</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>תגובת XML פגומה. שורה %1: %2</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>שום צלילות נבחרו</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="181"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="179"/>
         <source>internal error</source>
         <translation>שגיאה פנימית</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>סיים</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>העלאת רשימת צלילות...</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>הורדת רשימת צלילות...</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>הורדת 1% צלילות...</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>ההורדה הסתיימה - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
         <source>Corrupted download</source>
         <translation>הורדה פגומה</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>לא היה אפשרות לפתוח את הארכיון:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Upload failed</source>
         <translation>ההעלאה נכשלה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="849"/>
         <source>Upload successful</source>
         <translation>ההעלאה הסתיימה בהצלחה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="854"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="852"/>
         <source>Login failed</source>
         <translation>שגיאת התחברות (הזדהות)</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>תשובה לא ברורה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="868"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Error: %1</source>
         <translation>שגיאה: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="835"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/>
         <source>Upload finished</source>
         <translation>ההעלאה הסתיימה</translation>
     </message>
@@ -838,54 +933,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>אשר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="165"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/>
         <source>Error</source>
         <translation>שגיאה</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>נסה שוב</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="323"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="325"/>
         <source>Log files (*.log)</source>
         <translation>קבצי יומן (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="339"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
         <source>Warning</source>
         <translation>אזהרה</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="353"/>
         <source>Dump files (*.bin)</source>
         <translation>קבצי Dump (*.bin)</translation>
     </message>
@@ -942,865 +1037,871 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
         <source>Save libdivecomputer logfile</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
         <source>Save libdivecomputer dumpfile</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <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>הערות צלילה</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>מיקום</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="148"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Coordinates</source>
         <translation>קואורדינטות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="169"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
         <source>Divemaster</source>
         <translation>מדריך צלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="155"/>
+        <location filename="../qt-ui/maintab.ui" line="148"/>
         <source>Buddy</source>
         <translation>בן זוג</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="63"/>
-        <source>Start time</source>
-        <translation>זמן התחלה</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>טמפ&apos; האוויר</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>טמפ&apos; מים</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="127"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Tags</source>
         <translation>תגיות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="223"/>
         <source>Rating</source>
         <translation>דירוג</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="236"/>
         <source>Visibility</source>
         <translation>ראות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="215"/>
+        <location filename="../qt-ui/maintab.ui" line="127"/>
         <source>Suit</source>
         <translation>חליפה</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>הערות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="270"/>
+        <location filename="../qt-ui/maintab.ui" line="311"/>
         <source>Equipment</source>
         <translation>ציוד</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="350"/>
+        <location filename="../qt-ui/maintab.ui" line="391"/>
         <source>Dive Info</source>
         <translation>פרטי צלילה</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>תאריך</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="414"/>
+        <location filename="../qt-ui/maintab.ui" line="275"/>
+        <source>Time</source>
+        <translation>זמן</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="455"/>
         <source>Interval</source>
         <translation>משך</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="433"/>
+        <location filename="../qt-ui/maintab.ui" line="474"/>
         <source>Gases Used</source>
         <translation>אוויר שנוצל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="452"/>
+        <location filename="../qt-ui/maintab.ui" line="493"/>
         <source>Gas Consumed</source>
         <translation>אוויר שנוצל</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>צריכת אויר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="531"/>
         <source>Max. Depth</source>
         <translation>עומק מירבי</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="509"/>
+        <location filename="../qt-ui/maintab.ui" line="550"/>
         <source>Ave. Depth</source>
         <translation>עומק ממוצע</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="528"/>
+        <location filename="../qt-ui/maintab.ui" line="569"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="547"/>
+        <location filename="../qt-ui/maintab.ui" line="588"/>
         <source>Air Pressure</source>
         <translation>לחץ אוויר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="566"/>
+        <location filename="../qt-ui/maintab.ui" line="607"/>
         <source>Air Temperature</source>
         <translation>טמפרטורת אוויר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="585"/>
+        <location filename="../qt-ui/maintab.ui" line="626"/>
         <source>Water Temperature</source>
         <translation>טמפרטורת מים</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="604"/>
+        <location filename="../qt-ui/maintab.ui" line="645"/>
         <source>Dive Time</source>
         <translation>משך הצלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="623"/>
+        <location filename="../qt-ui/maintab.ui" line="664"/>
         <source>Salinity</source>
         <translation>מליחות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="660"/>
+        <location filename="../qt-ui/maintab.ui" line="701"/>
         <source>Stats</source>
         <translation>סטטסטיקות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="746"/>
         <source>Depth</source>
         <translation>עומק</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Temperature</source>
         <translation>טמפרטורה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="784"/>
         <source>Duration</source>
         <translation>משך הצלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Total Time</source>
         <translation>סה&quot;כ זמן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="835"/>
         <source>Dives</source>
         <translation>צלילות</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="919"/>
+        <source>Photos</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="89"/>
         <source>Cylinders</source>
         <translation>מיכלים</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="90"/>
         <source>Add Cylinder</source>
         <translation>הוסף מיכל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="93"/>
         <source>Weights</source>
         <translation>משקולות</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>הוסף מערכת משקולות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="438"/>
+        <location filename="../qt-ui/maintab.cpp" line="409"/>
         <source>Trip Location</source>
         <translation>מיקום</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>הערות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="42"/>
+        <location filename="../qt-ui/maintab.cpp" line="48"/>
         <source>Save</source>
         <translation>שמור</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="46"/>
+        <location filename="../qt-ui/maintab.cpp" line="52"/>
         <source>Cancel</source>
         <translation>בטל</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>צלילות מרובות בעריכה.</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>צלילה זו בעריכה.</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>לדקה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="494"/>
+        <location filename="../qt-ui/maintab.cpp" line="464"/>
         <source>unknown</source>
         <translation>לא ידוע</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>N</source>
-        <translation>צ</translation>
+        <location filename="../qt-ui/maintab.cpp" line="501"/>
+        <source>Deepest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>S</source>
-        <translation>ד</translation>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <source>Shallowest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>E</source>
-        <translation>מז</translation>
+        <location filename="../qt-ui/maintab.cpp" line="794"/>
+        <source>Discard the Changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>W</source>
-        <translation>מע</translation>
+        <location filename="../qt-ui/maintab.cpp" line="795"/>
+        <source>You are about to discard your changes.</source>
+        <translation type="unfinished"/>
     </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>פילטר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="571"/>
+        <location filename="../qt-ui/mainwindow.ui" line="646"/>
         <source>&amp;File</source>
         <translation>&amp;קובץ</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="583"/>
+        <source>Print</source>
+        <translation>הדפס</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:'Courier'; 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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
         <source>&amp;Log</source>
         <translation>&amp;יומן</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="628"/>
+        <location filename="../qt-ui/mainwindow.ui" line="701"/>
         <source>&amp;Help</source>
         <translation>&amp;עזרה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="636"/>
+        <location filename="../qt-ui/mainwindow.ui" line="709"/>
         <source>&amp;Import</source>
         <translation>&amp;ייבא</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>יומן &amp;חדש</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="655"/>
+        <location filename="../qt-ui/mainwindow.ui" line="728"/>
         <source>New</source>
         <translation>חדש</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="658"/>
+        <location filename="../qt-ui/mainwindow.ui" line="731"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</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>&amp;לפתוח יומן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="666"/>
+        <location filename="../qt-ui/mainwindow.ui" line="739"/>
         <source>Open</source>
         <translation>פתח</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <location filename="../qt-ui/mainwindow.ui" line="742"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="674"/>
+        <location filename="../qt-ui/mainwindow.ui" line="747"/>
         <source>&amp;Save</source>
         <translation>&amp;שמור</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="677"/>
+        <location filename="../qt-ui/mainwindow.ui" line="750"/>
         <source>Save</source>
         <translation>שמור</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="680"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>Save as</source>
         <translation>שמור בשם</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>Ctrl+Shift+S</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>&amp;סגור</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Close</source>
         <translation>סגור</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="702"/>
+        <location filename="../qt-ui/mainwindow.ui" line="775"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="902"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <source>P&amp;references</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="831"/>
+        <source>&amp;Add Dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <source>Auto &amp;Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="863"/>
+        <source>&amp;Dive List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="871"/>
+        <source>&amp;Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="879"/>
+        <source>&amp;Info</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="887"/>
+        <source>&amp;All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="895"/>
+        <source>P&amp;rev DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="903"/>
+        <source>&amp;Next DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="911"/>
+        <source>&amp;Select Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <source>&amp;About Subsurface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="937"/>
+        <source>&amp;Globe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="953"/>
+        <source>&amp;Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="959"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="707"/>
-        <source>Export &amp;UDDF</source>
-        <translation>יצוא &amp;UDDF</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="1008"/>
+        <source>&amp;Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1011"/>
+        <source>Export Dive Logs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1014"/>
+        <source>Ctrl+E</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Enable the pN2 Graph</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <location filename="../qt-ui/mainwindow.ui" line="128"/>
         <source>Enable the pHe graph</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <location filename="../qt-ui/mainwindow.ui" line="290"/>
         <source>Show/hide heart rate</source>
         <translation>הצג/הסתר קצב לב</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <location filename="../qt-ui/mainwindow.ui" line="342"/>
         <source>Enable EAD, END, and EADD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="238"/>
         <source>Show NDL / TTS</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="456"/>
+        <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="710"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="715"/>
-        <source>Export HTML World Map</source>
-        <translation>לייצא מפת עולם HTML</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="718"/>
-        <source>Ctrl+H</source>
-        <translation>Ctrl+H</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="723"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>&amp;Print</source>
         <translation>&amp;הדפס</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="734"/>
+        <location filename="../qt-ui/mainwindow.ui" line="791"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="742"/>
+        <location filename="../qt-ui/mainwindow.ui" line="799"/>
         <source>&amp;Quit</source>
         <translation>&amp;צא</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="753"/>
+        <location filename="../qt-ui/mainwindow.ui" line="810"/>
         <source>Import from &amp;dive computer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="818"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="764"/>
+        <location filename="../qt-ui/mainwindow.ui" line="821"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="826"/>
         <source>&amp;Edit Device Names</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="834"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="782"/>
+        <location filename="../qt-ui/mainwindow.ui" line="839"/>
         <source>&amp;Renumber</source>
         <translation>&amp;מספר מחדש</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="785"/>
+        <location filename="../qt-ui/mainwindow.ui" line="842"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="798"/>
+        <location filename="../qt-ui/mainwindow.ui" line="855"/>
         <source>&amp;Yearly Statistics</source>
         <translation>&amp;סטטיסטיקה שנתית</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="801"/>
+        <location filename="../qt-ui/mainwindow.ui" line="858"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="806"/>
-        <source>Dive List</source>
-        <translation>רשימת צלילות</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="814"/>
-        <source>Profile</source>
-        <translation>פרופיל</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="822"/>
-        <source>Info</source>
-        <translation>פרטים</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="830"/>
-        <source>All</source>
-        <translation>כולם</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="872"/>
+        <location filename="../qt-ui/mainwindow.ui" line="929"/>
         <source>User &amp;Manual</source>
         <translation>&amp;מדריך משתמש</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="880"/>
-        <source>Globe</source>
-        <translation>גלובוס</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="888"/>
+        <location filename="../qt-ui/mainwindow.ui" line="945"/>
         <source>P&amp;lan Dive</source>
         <translation>ת&amp;כנן צלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="891"/>
+        <location filename="../qt-ui/mainwindow.ui" line="948"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="907"/>
-        <source>Import from Divelogs.de</source>
-        <translation>יבוא מ- Divelogs.de</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <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="951"/>
-        <source>Export CSV</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="726"/>
+        <location filename="../qt-ui/mainwindow.ui" line="783"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</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"/>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="131"/>
+        <location filename="../qt-ui/mainwindow.ui" line="157"/>
+        <location filename="../qt-ui/mainwindow.ui" line="186"/>
+        <location filename="../qt-ui/mainwindow.ui" line="215"/>
+        <location filename="../qt-ui/mainwindow.ui" line="241"/>
+        <location filename="../qt-ui/mainwindow.ui" line="267"/>
+        <location filename="../qt-ui/mainwindow.ui" line="293"/>
+        <location filename="../qt-ui/mainwindow.ui" line="319"/>
+        <location filename="../qt-ui/mainwindow.ui" line="345"/>
+        <location filename="../qt-ui/mainwindow.ui" line="371"/>
+        <location filename="../qt-ui/mainwindow.ui" line="397"/>
+        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>...</source>
         <translation>...</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="731"/>
-        <source>Preferences</source>
-        <translation>העדפות</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="745"/>
+        <location filename="../qt-ui/mainwindow.ui" line="802"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="756"/>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="774"/>
-        <source>Add Dive</source>
-        <translation>הוסף צלילה</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="793"/>
-        <source>Auto Group</source>
-        <translation>קבץ אוטומטי</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="809"/>
+        <location filename="../qt-ui/mainwindow.ui" line="866"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="817"/>
+        <location filename="../qt-ui/mainwindow.ui" line="874"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <location filename="../qt-ui/mainwindow.ui" line="882"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="833"/>
+        <location filename="../qt-ui/mainwindow.ui" line="890"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="838"/>
-        <source>Prev DC</source>
-        <translation>קודם</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="841"/>
+        <location filename="../qt-ui/mainwindow.ui" line="898"/>
         <source>Left</source>
         <translation>שמאל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="846"/>
-        <source>Next DC</source>
-        <translation>הבא</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="849"/>
+        <location filename="../qt-ui/mainwindow.ui" line="906"/>
         <source>Right</source>
         <translation>ימין</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="854"/>
-        <source>Select Events</source>
-        <translation>בחירת אירועים</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <location filename="../qt-ui/mainwindow.ui" line="916"/>
         <source>Input Plan</source>
         <translation>הכנסת תכנית</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="864"/>
-        <source>About Subsurface</source>
-        <translation>אודות Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="875"/>
+        <location filename="../qt-ui/mainwindow.ui" line="932"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="883"/>
+        <location filename="../qt-ui/mainwindow.ui" line="940"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="896"/>
-        <source>Import Log Files</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/mainwindow.ui" line="956"/>
+        <source>Import divelog files from other applications</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="899"/>
-        <source>Import divelog files from other applications</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/mainwindow.ui" line="964"/>
+        <source>Import &amp;from Divelogs.de</source>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <location filename="../qt-ui/mainwindow.ui" line="978"/>
         <source>F11</source>
-        <translation type="unfinished">F11</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="174"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
         <source>Open File</source>
         <translation>פתך קובץ</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>נא לשמור או לבטל את עריכת הצלילה הנוכחית לפני סגירת הקובץ.</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>
-        <translation>נא לשמור או לבטל את עריכת הצלילה הנוכחית לפני שאתה מנסה לתכנן צלילה.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="396"/>
+        <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>נא לשמור או לבטל את עריכת הצלילה הנוכחית לפני שאתה מנסה להוסיף צלילה.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="645"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="419"/>
+        <source>Print runtime table</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="710"/>
         <source>Do you want to save the changes you made in the file %1?</source>
         <translation>האם ברצונכם לשמור שינויים בקובץ %1 ?</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>האם לשמור שינויים בקובץ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="652"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="717"/>
         <source>Save Changes?</source>
         <translation>לשמור שינויים?</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>כל השינויים יאבדו אם לא תשמרו אותם.</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>שמור קובץ בשם</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>אזהרה</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>נא לשמור או לבטל את עריכת הצלילה הנוכחית לפני פתיחת קובץ חדש.</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>UDDF קבצי (*.uddf *.UDDF)</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>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="300"/>
-        <source>HTML files (*.html)</source>
-        <translation>קבצי HTML (*.html)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="449"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="514"/>
         <source>Yearly Statistics</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="961"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1076"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>קבצי XML  נתמכים (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1199"/>
         <source>Open Dive Log File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1107"/>
+        <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>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PlannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Last stop at 20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="416"/>
+        <source>Last stop at 6m</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1826,247 +1927,297 @@ Please, remove them first.</source>
         <translation>שפה</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="151"/>
         <source>Lists and Tables</source>
         <translation>רשימות וטבלאות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font</source>
         <translation>גופן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="167"/>
         <source>Font size</source>
         <translation>גודל גופן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="170"/>
+        <location filename="../qt-ui/preferences.ui" line="180"/>
         <source>Dives</source>
         <translation>צלילות</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>קובץ ברירות המחדל לצלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="188"/>
+        <location filename="../qt-ui/preferences.ui" line="198"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="197"/>
+        <location filename="../qt-ui/preferences.ui" line="207"/>
         <source>Display Invalid</source>
         <translation>שגיאת הצגה</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <location filename="../qt-ui/preferences.ui" line="247"/>
         <source>Animations</source>
         <translation>אנימציות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <location filename="../qt-ui/preferences.ui" line="253"/>
         <source>Speed</source>
         <translation>מהירות</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <source>Clear all settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="312"/>
+        <source>Reset all settings to their default value</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
         <source>System</source>
         <translation>מערכת</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="348"/>
         <source>Metric</source>
         <translation>מידה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="333"/>
+        <location filename="../qt-ui/preferences.ui" line="358"/>
         <source>Imperial</source>
         <translation>אמריקאית</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="343"/>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
         <source>Personalize</source>
         <translation>התאמה אישית</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="392"/>
         <source>Depth</source>
         <translation>עומק</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="374"/>
+        <location filename="../qt-ui/preferences.ui" line="399"/>
         <source>meter</source>
         <translation>מטר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="409"/>
         <source>feet</source>
         <translation>רגל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="401"/>
+        <location filename="../qt-ui/preferences.ui" line="426"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="411"/>
+        <location filename="../qt-ui/preferences.ui" line="436"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="428"/>
+        <location filename="../qt-ui/preferences.ui" line="453"/>
         <source>liter</source>
         <translation>ליטר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="438"/>
+        <location filename="../qt-ui/preferences.ui" line="463"/>
         <source>cu ft</source>
         <translation>רגל מ&quot;ק</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="455"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>celsius</source>
         <translation>צלסיוס</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="465"/>
+        <location filename="../qt-ui/preferences.ui" line="490"/>
         <source>fahrenheit</source>
         <translation>פרנהייט</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="482"/>
+        <location filename="../qt-ui/preferences.ui" line="507"/>
         <source>kg</source>
         <translation>קילוגרם</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="636"/>
-        <source>max ppO₂ when showing MOD</source>
-        <translation type="unfinished"></translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="811"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="817"/>
+        <source>Proxy type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="657"/>
+        <location filename="../qt-ui/preferences.ui" line="830"/>
+        <source>Host</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="856"/>
+        <source>Port</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="882"/>
+        <source>Requires authentication</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="925"/>
+        <source>Password</source>
+        <translation>סיסמא</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="682"/>
         <source>draw dive computer reported ceiling red</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="747"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>System Default</source>
         <translation>ברירת מחדל של המערכת</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="767"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>Filter</source>
         <translation>פילטר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="419"/>
         <source>Pressure</source>
         <translation>לחץ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="421"/>
+        <location filename="../qt-ui/preferences.ui" line="446"/>
         <source>Volume</source>
         <translation>נפח</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="448"/>
+        <location filename="../qt-ui/preferences.ui" line="473"/>
         <source>Temperature</source>
         <translation>טמפרטורה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="475"/>
+        <location filename="../qt-ui/preferences.ui" line="500"/>
         <source>Weight</source>
         <translation>משקל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="517"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="507"/>
+        <location filename="../qt-ui/preferences.ui" line="532"/>
         <source>Time units</source>
         <translation>יחידות זמן</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>מקדם עליה וירידה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="520"/>
+        <location filename="../qt-ui/preferences.ui" line="545"/>
         <source>Minutes</source>
         <translation>דקות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="530"/>
+        <location filename="../qt-ui/preferences.ui" line="555"/>
         <source>Seconds</source>
         <translation>שניות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="562"/>
+        <location filename="../qt-ui/preferences.ui" line="587"/>
         <source>Show</source>
         <translation>הצג</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="693"/>
         <source>Show non-used cylinders in Equipment Tab</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="691"/>
+        <location filename="../qt-ui/preferences.ui" line="716"/>
         <source>Misc</source>
         <translation>שונות</translation>
     </message>
@@ -2076,35 +2227,65 @@ Please, remove them first.</source>
         <translation>העדפות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="697"/>
+        <location filename="../qt-ui/preferences.ui" line="722"/>
         <source>GFLow</source>
         <translation>גרדיאנט תחתון</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="739"/>
         <source>GFHigh</source>
         <translation>גרדיאנט עליון</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="24"/>
+        <source>System proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="25"/>
+        <source>HTTP proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="26"/>
+        <source>SOCKS proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="245"/>
         <source>Restart required</source>
         <translation>נדרשת הפעלה מחדש</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>כדי לטעון שפה חדשה בצורה נכונה עליך להפעיל מחדש את Subsurface</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>פתח יומן ברירת מחדל</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>קבצי XML  נתמכים (*.ssrf *.xml *.XML)</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="394"/>
+        <source>Warning</source>
+        <translation>אזהרה</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"/>
+    </message>
 </context>
 <context>
     <name>PrintDialog</name>
@@ -2245,72 +2426,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>לא ידוע</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>צלילות מס %1 - %2</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>עומק מקסימלי: %1 %2</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>זמן: %1 דקות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1918"/>
+        <location filename="../qt-ui/models.cpp" line="1898"/>
         <source>Gas Used:</source>
         <translation>אוויר שנוצל:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1920"/>
+        <location filename="../qt-ui/models.cpp" line="1900"/>
         <source>SAC:</source>
         <translation>צריכת אויר:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1922"/>
+        <location filename="../qt-ui/models.cpp" line="1902"/>
         <source>Max. CNS:</source>
         <translation>רעילות שייורית מקסימלית</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1924"/>
+        <location filename="../qt-ui/models.cpp" line="1904"/>
         <source>Weights:</source>
         <translation>משקולות:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1929"/>
+        <location filename="../qt-ui/models.cpp" line="1909"/>
         <source>Notes:</source>
         <translation>הערות:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1936"/>
+        <location filename="../qt-ui/models.cpp" line="1916"/>
         <source>Divemaster:</source>
         <translation>מדריך צלילה:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1938"/>
+        <location filename="../qt-ui/models.cpp" line="1918"/>
         <source>Buddy:</source>
         <translation>בן זוג:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1940"/>
+        <location filename="../qt-ui/models.cpp" line="1920"/>
         <source>Suit:</source>
         <translation>חליפה:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1942"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>Viz:</source>
         <translation>ראות:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1944"/>
+        <location filename="../qt-ui/models.cpp" line="1924"/>
         <source>Rating:</source>
         <translation>דירוג</translation>
     </message>
@@ -2318,77 +2499,92 @@ 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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/>
+        <source>Make first divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="906"/>
+        <source>Delete this divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="913"/>
         <source>Add Gas Change</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>הוספת סימנייה</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>הסר את האירוע</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>הסתר אירועים דומים</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>
+        <translation type="unfinished"/>
     </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>חשוף את כל האירועים</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>הסתר אירועים</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>הסתר את כל %1 האירועים</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>הסר את האירוע שנבחרו?</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>%1 @ %2:%3</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>אוויר</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>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
@@ -2396,22 +2592,22 @@ Please, remove them first.</source>
         <translation>סגור</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="34"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation>ממוצע</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="37"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation>מינימום</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="40"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation>מקסימום</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>תזיז את המפה ולחץ לחיצה כפולה כדי לקבוע את מיקום הצלילה</translation>
     </message>
@@ -2425,59 +2621,78 @@ 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>מספר התחלתי חדש</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="126"/>
+        <source>New number</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchBar</name>
+    <message>
+        <location filename="../qt-ui/searchbar.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ShiftImageTimesDialog</name>
     <message>
         <location filename="../qt-ui/shiftimagetimes.ui" line="23"/>
         <source>Shift selected times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shiftimagetimes.ui" line="34"/>
         <source>Shift times of image(s) by</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="95"/>
+        <source>h:mm</source>
+        <translation>h:mm</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="102"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="105"/>
         <source>earlier</source>
         <translation>מוקדם יותר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="109"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="112"/>
         <source>later</source>
         <translation>מאוחר יותר</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>איזה תאריך ושעה מוצגים בתמונה?</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>פתך קובץ תמונה</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>קבצי תמונה (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2487,22 +2702,22 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="23"/>
         <source>Shift selected times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="49"/>
         <source>Shift times of selected dives by</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="72"/>
         <source>Shifted time:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="79"/>
         <source>Current time:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="86"/>
@@ -2551,48 +2766,48 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/about.cpp" line="13"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014&lt;/span&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>שרות איטרנט</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/>
         <source>Connecting...</source>
         <translation>מתחבר...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="421"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="419"/>
         <source>Download finished</source>
         <translation>ההורדה הסתיימה</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>שגיאת הורדה: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/>
         <source>Connection Error: </source>
         <translation>שגיאת חיבור:</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>שם משתמש לא חוקי!</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>תשובה לא מובנת!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/>
         <source>Download Success!</source>
         <translation>ההורדה הצליחה!</translation>
     </message>
@@ -2608,17 +2823,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>תיאור</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>ml</source>
         <translation>מ&quot;ל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2626,7 +2841,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>מידע נוסף</translation>
     </message>
@@ -2634,68 +2849,206 @@ 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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="37"/>
-        <source>&lt;h3&gt;Subsurface was unable to check for updates.&lt;/h3&gt;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="36"/>
+        <source>Subsurface was unable to check for updates.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
-        <source>&lt;br/&gt;&lt;b&gt;The following error occurred:&lt;/b&gt;&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="41"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="43"/>
-        <source>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Please check your internet connection.&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>מדריך משתמש</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>קובץ המדריך למשתמש לא נמצא</translation>
     </message>
 </context>
 <context>
+    <name>UserSurvey</name>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="47"/>
+        <source>Subsurface User Survey</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="79"/>
+        <source>Recreational DIver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="92"/>
+        <source>Tech Diver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="105"/>
+        <source>Interested in dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="118"/>
+        <source>I am downloading dives from supported dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="131"/>
+        <source>I am importing dives from other software / sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="144"/>
+        <source>I am manually entering dives</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="190"/>
+        <source>Please type suggestions (in English) in the following box</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="27"/>
+        <source>
+Operating System: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="30"/>
+        <source>
+CPU Architecture: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="35"/>
+        <source>
+OS CPU Architecture %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="39"/>
+        <source>
+Language: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="73"/>
+        <source>Should we ask you later?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="74"/>
+        <source>Don&apos;t ask me again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="75"/>
+        <source>Ask Later</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="76"/>
+        <source>Ask again?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <source>Submit User Survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <source>Subsurface was unable to submit the user survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="101"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="102"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="111"/>
+        <source>Survey successfully submitted.</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </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>תיאור</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="723"/>
+        <location filename="../qt-ui/models.cpp" line="721"/>
         <source>kg</source>
         <translation>קילוגרם</translation>
     </message>
@@ -2730,7 +3083,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/webservices.ui" line="85"/>
         <source>Save User ID locally?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="92"/>
@@ -2743,12 +3096,12 @@ Please, remove them first.</source>
         <translation>ההעלאה</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>הפעולה נכשלה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="279"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="277"/>
         <source>Transfering data...</source>
         <translation>מעביר נתונים...</translation>
     </message>
@@ -2756,37 +3109,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>סוג</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="368"/>
+        <location filename="../qt-ui/models.cpp" line="373"/>
         <source>Weight</source>
         <translation>משקל</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="453"/>
+        <location filename="../qt-ui/models.cpp" line="458"/>
         <source>kg</source>
         <translation>קילוגרם</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="454"/>
+        <location filename="../qt-ui/models.cpp" line="459"/>
         <source>lbs</source>
         <translation>ליברה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="478"/>
+        <location filename="../qt-ui/models.cpp" line="483"/>
         <source>ft</source>
         <translation>רגל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="484"/>
         <source>m</source>
         <translation>מטר</translation>
     </message>
@@ -2794,79 +3147,79 @@ 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>שנה
 &gt; חודש / טיול</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1643"/>
         <source>Duration 
  Total</source>
         <translation>משך
 כולל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>
 Average</source>
         <translation>
 ממוצע</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>
 Shortest</source>
         <translation>
 קצר ביותר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>
 Longest</source>
         <translation>
 ארוך ביותר</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>עומק (%1)
 ממוצע</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>
 מינימום</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>
 מקסימום</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>צריכת אויר (%1)
 ממוצע</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>טמפ&apos; (%1)
@@ -2876,99 +3229,92 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="58"/>
+        <location filename="../dive.c" line="87"/>
         <source>pascal</source>
         <translation>פסקל</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>bar</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>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="104"/>
-        <location filename="../qt-gui.cpp" line="292"/>
-        <source>l</source>
-        <translation>l</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>cuft</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>מטר</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>רגל</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>lbs</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>קילוגרם</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1120"/>
+        <location filename="../dive.c" line="1237"/>
         <source>(%s) or (%s)</source>
         <translation>(%S) או (%S)</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>אוויר</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="170"/>
+        <location filename="../equipment.c" line="210"/>
         <source>integrated</source>
         <translation>איטגרל</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="171"/>
+        <location filename="../equipment.c" line="211"/>
         <source>belt</source>
         <translation>חגורה</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="172"/>
+        <location filename="../equipment.c" line="212"/>
         <source>ankle</source>
         <translation>קרסול</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="173"/>
+        <location filename="../equipment.c" line="213"/>
         <source>backplate weight</source>
         <translation>משקל פלטת גב</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="174"/>
+        <location filename="../equipment.c" line="214"/>
         <source>clip-on</source>
         <translation>נצמד</translation>
     </message>
@@ -2982,820 +3328,868 @@ Maximum</source>
         <location filename="../file.c" line="406"/>
         <location filename="../file.c" line="482"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>none</source>
         <translation>אין</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>deco stop</source>
         <translation>עצירה לדיקומפרסיה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>rbt</source>
         <translation>זמן נותר בעומק</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ascent</source>
         <translation>עליה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ceiling</source>
         <translation>תקרה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>workload</source>
         <translation>עומס</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>transmitter</source>
         <translation>משדר</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>violation</source>
         <translation>חריגה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>bookmark</source>
         <translation>סימניה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>surface</source>
         <translation>שטח</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>safety stop</source>
         <translation>עצירת בטיחות</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>החלפת גז</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (voluntary)</source>
         <translation>עצירת בטיחות (יזומה)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (mandatory)</source>
         <translation>עצירת בטיחות (חובה)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>deepstop</source>
         <translation>עצירה בעומק</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>ceiling (safety stop)</source>
         <translation>תקרה (עצירת בטיחות)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>divetime</source>
         <translation>זמןצלילה</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>maxdepth</source>
         <translation>עומק מקס&apos;</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>airtime</source>
         <translation>זמן אויר</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>heading</source>
         <translation>כותרת</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>tissue level warning</source>
         <translation>אזהרת רמות רקמות</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>non stop time</source>
         <translation>זמן ללא עצירה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="163"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>invalid event number</source>
         <translation>מס&apos; ארוע שגוי</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>לא מצליח להבין %s %s </translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="411"/>
+        <location filename="../libdivecomputer.c" line="414"/>
         <source>Error registering the data</source>
         <translation>שגיאה ברישום המידע</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="419"/>
+        <location filename="../libdivecomputer.c" line="422"/>
         <source>Error parsing the datetime</source>
         <translation>שגיאה בקריאת תאריך</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="438"/>
         <source>Dive %d: %s %d %04d</source>
         <translation>צלילה %d: %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="440"/>
+        <location filename="../libdivecomputer.c" line="443"/>
         <source>Error parsing the divetime</source>
         <translation>שגיאה בקריאת זמן צלילה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="449"/>
+        <location filename="../libdivecomputer.c" line="452"/>
         <source>Error parsing the maxdepth</source>
         <translation>שגיאה בקריאת עומק מקסימלי</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="458"/>
+        <location filename="../libdivecomputer.c" line="461"/>
         <source>Error parsing the gas mix count</source>
         <translation>שגיאה בקריאת תערובת גזים</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="470"/>
+        <location filename="../libdivecomputer.c" line="473"/>
         <source>Error obtaining water salinity</source>
         <translation>שגיאה בקבלת מליחות מים</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error obtaining surface pressure</source>
         <translation>שגיאה בקבלת לחץ על פני המים</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the gas mix</source>
         <translation>שגיאה בקריאת תערובת הגזים</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="493"/>
+        <location filename="../libdivecomputer.c" line="496"/>
         <source>Error parsing the samples</source>
         <translation>שגיאה בקריאת נקודות דגימה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="623"/>
+        <location filename="../libdivecomputer.c" line="626"/>
         <source>Event: waiting for user action</source>
         <translation>אירוע: מחכה לפעולה של המשתמש</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>דגם=%u (0x%08x), הקושחה=%u (0x%08x), מספר סידורי=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="691"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the event handler.</source>
         <translation>שגיאה ברישום שגרת ניהול</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="717"/>
+        <location filename="../libdivecomputer.c" line="720"/>
         <source>Dive data import error</source>
         <translation>שגיאת יבוא נתוני צלילה</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="763"/>
+        <location filename="../libdivecomputer.c" line="766"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>לא ניתן לפתוח את %s %s (%s)</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1846"/>
+        <location filename="../parse-xml.c" line="1904"/>
         <source>Database query get_events failed.
 </source>
         <translation>שאילתת מסד נתונים של Get_events נכשל
 </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>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../file.c" line="166"/>
-        <source>Database connection failed &apos;%s&apos;.
+        <source>Database connection failed '%s'.
 </source>
         <translation>החיבור למסד הנתונים נכשל &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1887"/>
-        <location filename="../parse-xml.c" line="2034"/>
-        <source>Database query failed &apos;%s&apos;.
+        <location filename="../parse-xml.c" line="1945"/>
+        <location filename="../parse-xml.c" line="2092"/>
+        <source>Database query failed '%s'.
 </source>
         <translation>שאילתת מסד נתונים נכשל &apos;%s&apos;.
 </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>לא ניתן לפתוח את גיליון העיצוב %s</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>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="146"/>
-        <location filename="../planner.c" line="617"/>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation>לא ניתן למצוא את הגז %d/%d</translation>
+        <location filename="../planner.c" line="159"/>
+        <location filename="../planner.c" line="752"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="308"/>
+        <location filename="../planner.c" line="345"/>
         <source>Too many gas mixes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="489"/>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation type="unfinished"></translation>
+        <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"/>
     </message>
     <message>
-        <location filename="../planner.c" line="530"/>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../planner.c" line="535"/>
+        <source>based on GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="539"/>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../planner.c" line="538"/>
+        <source>Subsurface dive plan</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="550"/>
-        <source>Switch gas to %s
-</source>
-        <translation>לעבור לגז s%
-</translation>
+        <location filename="../planner.c" line="542"/>
+        <source>depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="558"/>
-        <source>Gas consumption:
-</source>
-        <translation>צריכת דלק:
-</translation>
+        <location filename="../planner.c" line="545"/>
+        <source>runtime</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="569"/>
-        <source>%.0f%s of %s
-</source>
-        <translation>%.0f%s of %s
-</translation>
+        <location filename="../planner.c" line="548"/>
+        <source>duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="551"/>
+        <source>gas</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="606"/>
+        <source>%3.0f%s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
+        <source>%3dmin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="629"/>
+        <source>Switch gas to %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="638"/>
+        <source>Gas consumption:</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="659"/>
+        <source>this is more gas than available in the specified cylinder!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="664"/>
+        <source>not enough reserve for gas sharing on ascent!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="810"/>
+        <location filename="../planner.c" line="666"/>
+        <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="668"/>
+        <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="980"/>
         <source>ean</source>
         <translation>ean</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1229"/>
+        <location filename="../profile.c" line="1253"/>
         <source>P: %d%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1233"/>
+        <location filename="../profile.c" line="1257"/>
         <source>T: %.1f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1263"/>
         <source>V: %.1f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1244"/>
+        <location filename="../profile.c" line="1268"/>
         <source>CNS: %u%%
 </source>
         <translation>רעילות שייורית מקסימלית %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1246"/>
+        <location filename="../profile.c" line="1270"/>
         <source>pO%s: %.2fbar
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1272"/>
         <source>pN%s: %.2fbar
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="1274"/>
         <source>pHe: %.2fbar
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="1277"/>
         <source>MOD: %d%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1276"/>
+        <location filename="../profile.c" line="1300"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="1308"/>
         <source>Deco: %umin @ %.0f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1291"/>
+        <location filename="../profile.c" line="1315"/>
         <source>In deco
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1293"/>
+        <location filename="../profile.c" line="1317"/>
         <source>NDL: %umin
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1305"/>
+        <location filename="../profile.c" line="1329"/>
         <source>In deco (calc)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1307"/>
+        <location filename="../profile.c" line="1331"/>
         <source>NDL: %umin (calc)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1310"/>
+        <location filename="../profile.c" line="1334"/>
         <source>TTS: %umin (calc)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1313"/>
+        <location filename="../profile.c" line="1337"/>
         <source>Calculated ceiling %.0f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1319"/>
+        <location filename="../profile.c" line="1343"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1325"/>
+        <location filename="../profile.c" line="1349"/>
         <source>heartbeat: %d
 </source>
         <translation>פעימות לב %d</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1327"/>
+        <location filename="../profile.c" line="1351"/>
         <source>bearing: %d
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1419"/>
+        <location filename="../profile.c" line="1443"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1435"/>
+        <location filename="../profile.c" line="1459"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1439"/>
+        <location filename="../profile.c" line="1463"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</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>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1454"/>
+        <location filename="../profile.c" line="1478"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="273"/>
+        <location filename="../qt-gui.cpp" line="281"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="276"/>
+        <location filename="../qt-gui.cpp" line="284"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="392"/>
-        <source>%1, %2 %3, %4 %5:%6</source>
-        <translation>%1, %2 %3, %4 %5:%6</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="405"/>
-        <source>%1 %2, %3
-%4:%5</source>
-        <translation>%1 %2, %3
-%4:%5</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="418"/>
+        <location filename="../qt-gui.cpp" line="417"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 צלילות)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="423"/>
+        <location filename="../qt-gui.cpp" line="422"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 צלילה)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>boat</source>
         <translation>ספינה</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>shore</source>
         <translation>חוף</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>drift</source>
         <translation>סחיפה</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>deep</source>
         <translation>עמוק</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>cavern</source>
         <translation>מחילה</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>ice</source>
         <translation>קרח</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>wreck</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>cave</source>
         <translation>מערה</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>altitude</source>
         <translation>גובה</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>pool</source>
         <translation>ברכה</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>lake</source>
         <translation>אגם</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>river</source>
         <translation>נחל</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>night</source>
         <translation>לילה</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>fresh</source>
         <translation>fresh</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>student</source>
         <translation>תלמיד</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>photo</source>
         <translation>תצלום</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>video</source>
         <translation>וידאו</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>instructor</source>
         <translation>מדריך</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="25"/>
         <source>deco</source>
         <translation>דקומפרסיה</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="216"/>
+        <location filename="../dive.c" line="133"/>
+        <source>ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="214"/>
         <source>more than %d days</source>
         <translation>יותר מ-%d ימים</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="220"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="224"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="235"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation>לצלילות #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="242"/>
+        <location filename="../statistics.c" line="240"/>
         <source>for selected dives</source>
         <translation>לצלילות שנבחרו</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="275"/>
         <source>for dive #%d</source>
         <translation>לצלילה #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for selected dive</source>
         <translation>לצלילה שנבחרה</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for all dives</source>
         <translation>לכל הצלילות</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="283"/>
+        <location filename="../statistics.c" line="281"/>
         <source>(no dives)</source>
         <translation>(שום צלילות)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sun</source>
         <translation>ראשון</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Mon</source>
         <translation>שני</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Tue</source>
         <translation>שלישי</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Wed</source>
         <translation>רביעי</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Thu</source>
         <translation>חמישי</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Fri</source>
         <translation>שישי</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sat</source>
         <translation>שבת</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jan</source>
         <translation>ינואר</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Feb</source>
         <translation>פבואר</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Mar</source>
         <translation>מרץ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Apr</source>
         <translation>אפריל</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>May</source>
         <translation>מאי</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jun</source>
         <translation>יוני</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Jul</source>
         <translation>יולי</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Aug</source>
         <translation>אוגוסט</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Sep</source>
         <translation>ספטמבר</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Oct</source>
         <translation>אוקטובר</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Nov</source>
         <translation>נובמבר</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Dec</source>
         <translation>דצמבר</translation>
     </message>
@@ -3804,120 +4198,120 @@ EADD: %d%s
         <source>Uemis Zurich: File System is almost full
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="25"/>
         <source>Uemis Zurich: File System is full
 Disconnect/reconnect the dive computer
 and try again</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="26"/>
         <source>Short write to req.txt file
 Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="107"/>
+        <location filename="../uemis-downloader.c" line="111"/>
         <source>unknown</source>
         <translation>לא ידוע</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="379"/>
+        <location filename="../uemis-downloader.c" line="383"/>
         <source>Reading %s %s</source>
         <translation>קורא %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="399"/>
+        <location filename="../uemis-downloader.c" line="403"/>
         <source>data</source>
         <translation>נתונים</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>wetsuit</source>
         <translation>חליפת צלילה</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>semidry</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>drysuit</source>
         <translation>חליפה יבשה</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>shorty</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>vest</source>
         <translation>אפוד</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>long john</source>
         <translation>לבנים ארוכים</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>jacket</source>
         <translation>ז&apos;קט</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>full suit</source>
         <translation>חליפה מלאה</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="620"/>
+        <location filename="../uemis-downloader.c" line="624"/>
         <source>membrane</source>
         <translation>ממברנה</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="815"/>
+        <location filename="../uemis-downloader.c" line="836"/>
         <source>Start download</source>
         <translation>התחל הורדה</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="196"/>
         <source>Safety Stop Violation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="198"/>
@@ -3931,23 +4325,23 @@ Is the Uemis Zurich plugged in correctly?</source>
     </message>
     <message>
         <location filename="../uemis.c" line="203"/>
-        <source>PO2 Green Warning</source>
-        <translation type="unfinished"></translation>
+        <source>pO₂ Green Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
-        <source>PO2 Ascend Warning</source>
-        <translation type="unfinished"></translation>
+        <source>pO₂ Ascend Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="208"/>
-        <source>PO2 Ascend Alarm</source>
-        <translation type="unfinished"></translation>
+        <source>pO₂ Ascend Alarm</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
         <source>Tank Pressure Info</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="214"/>
@@ -3962,37 +4356,37 @@ Is the Uemis Zurich plugged in correctly?</source>
     <message>
         <location filename="../uemis.c" line="218"/>
         <source>Tank Change Suggested</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="220"/>
         <source>Depth Limit Exceeded</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="222"/>
         <source>Max Deco Time Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="224"/>
         <source>Dive Time Info</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="226"/>
         <source>Dive Time Alert</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="228"/>
         <source>Marker</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="230"/>
         <source>No Tank Data</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="232"/>
@@ -4004,5 +4398,214 @@ Is the Uemis Zurich plugged in correctly?</source>
         <source>Low Battery Alert</source>
         <translation>התראת סוללה חלשה</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"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="36"/>
+        <source>Date:</source>
+        <translation>תאריך:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="38"/>
+        <source>Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="40"/>
+        <source>Duration:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="41"/>
+        <source>min</source>
+        <translation>דקה</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="43"/>
+        <source>Max Depth:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="46"/>
+        <source>Air Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="48"/>
+        <source>Water Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="50"/>
+        <source>Location:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="54"/>
+        <source>Notes:</source>
+        <translation>הערות:</translation>
+    </message>
+</context>
+<context>
+    <name>plannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="35"/>
+        <source>Rates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="56"/>
+        <source>Ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="77"/>
+        <source>below 75% avg. depth</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="94"/>
+        <source>75%-50% avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="111"/>
+        <source>50% avg. depth - 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="128"/>
+        <source>6m/20ft to surface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="148"/>
+        <source>Descent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="200"/>
+        <source>surface to the bottom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="226"/>
+        <source>Planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="247"/>
+        <source>GF low</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="264"/>
+        <source>GF high</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
+        <source>Drop to first depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
+        <source>Last Stop at 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>plan backgas breaks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="318"/>
+        <source>Gas Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <source>bottom SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="349"/>
+        <source>deco SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="359"/>
+        <source>bottom pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="389"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="382"/>
+        <source>deco pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="421"/>
+        <source>Dive Notes</source>
+        <translation>הערות צלילה</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="445"/>
+        <source>display runtime</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="458"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="461"/>
+        <source>display segment duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="471"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="474"/>
+        <source>display transitions in deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="481"/>
+        <source>verbatim diveplan</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/subsurface_hr_HR.ts b/translations/subsurface_hr_HR.ts
index 1a54f409c..5ba281458 100644
--- a/translations/subsurface_hr_HR.ts
+++ b/translations/subsurface_hr_HR.ts
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="hr_HR" version="2.0">
+<defaultcodec>UTF-8</defaultcodec>
 <context>
     <name>CylindersModel</name>
     <message>
@@ -37,42 +38,42 @@
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="507"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="508"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="527"/>
+        <location filename="../qt-ui/models.cpp" line="532"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="528"/>
+        <location filename="../qt-ui/models.cpp" line="533"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -99,22 +100,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>Model</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Nickname</source>
         <translation>Naziv uređaja</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"/>
     </message>
@@ -122,189 +123,325 @@
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="90"/>
-        <source>air</source>
-        <translation>zrak</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="92"/>
-        <source>EAN%1</source>
-        <translation type="unfinished"/>
-    </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>Neplanirani prelazak na OC sustav</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> započni</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> završi</translation>
     </message>
 </context>
 <context>
-    <name>DiveGasPressureItem</name>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="475"/>
-        <source>air</source>
-        <translation>zrak</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="476"/>
-        <source>EAN%1</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1258"/>
-        <source> l/min</source>
-        <translation type="unfinished"/>
-    </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <source>merge selected dives</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DiveLogExportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
+        <source>Export Dive Log Files</source>
         <translation type="unfinished"/>
     </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="24"/>
+        <source>General Export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="795"/>
-        <source>Save Dives As...</source>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="30"/>
+        <source>Export format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="814"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="42"/>
+        <source>Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="61"/>
+        <source>UDDF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="74"/>
+        <source>divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="84"/>
+        <source>CSV</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="94"/>
+        <source>Worldmap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="107"/>
+        <source>Selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="116"/>
+        <source>Selected dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="126"/>
+        <source>All dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="178"/>
+        <source>HTML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="184"/>
+        <source>General Settings</source>
+        <translation>Glavne postavke</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="190"/>
+        <source>Subsurface Numbers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="203"/>
+        <source>Selected Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="216"/>
+        <source>Minimum Javascript</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="229"/>
+        <source>All Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="239"/>
+        <source>Export List only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="252"/>
+        <source>Style Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="264"/>
+        <source>Font</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="274"/>
+        <source>Font size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
+        <source>8</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <source>10</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <source>12</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <source>14</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <source>16</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <source>18</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <source>20</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="323"/>
+        <source>Theme</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <source>Sand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="153"/>
         <source>Export UDDF File as</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="168"/>
+        <source>XML files (*.xml *.ssrf)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="176"/>
+        <source>Export HTML files as</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -316,138 +453,133 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="36"/>
-        <source>Import CSV Dive Log Files</source>
-        <translation type="unfinished"/>
-    </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="80"/>
         <source>Depth</source>
         <translation>Dubina</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="107"/>
         <source>PO2</source>
         <translation>PO2</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>Vrijeme</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="121"/>
         <source>Temp</source>
         <translation>Temp</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"/>
     </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>Jedinice</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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="283"/>
         <source>Dive #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="317"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="385"/>
         <source>Duration</source>
         <translation>Trajanje</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
         <source>Location</source>
         <translation>Lokacija</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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="368"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="402"/>
         <source>Notes</source>
         <translation>Bilješke</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="436"/>
         <source>Weight</source>
         <translation>Težina</translation>
     </message>
@@ -455,104 +587,70 @@
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="71"/>
-        <source>Bottom SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="85"/>
-        <source>SAC on DECO Stop</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="78"/>
-        <source>GFHigh</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="98"/>
-        <source>GFLow</source>
+        <location filename="../qt-ui/diveplanner.ui" line="106"/>
+        <source>Planned Dive Time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="125"/>
-        <source>Last Stop at 6m</source>
+        <location filename="../qt-ui/diveplanner.ui" line="134"/>
+        <source>Altitude</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="174"/>
-        <source>Start Time</source>
-        <translation type="unfinished"/>
-    </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"/>
     </message>
-</context>
-<context>
-    <name>DivePlannerGraphics</name>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="114"/>
-        <source>10m</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="116"/>
-        <source>30ft</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="363"/>
-        <source>Handler Position Error</source>
+        <location filename="../qt-ui/diveplanner.ui" line="148"/>
+        <source>mbar</source>
         <translation type="unfinished"/>
     </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>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/diveplanner.ui" line="158"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="445"/>
-        <source>AIR</source>
-        <translation>Zrak</translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="137"/>
+        <source>unknown</source>
+        <translation>nepoznato</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1152"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="590"/>
         <source>Duration</source>
         <translation>Trajanje</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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -560,17 +658,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"/>
     </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"/>
     </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"/>
     </message>
@@ -614,104 +712,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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>pO₂</source>
+        <translation type="unfinished"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
-        <source>PO2</source>
-        <translation>PO2</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <source>SAC</source>
+        <translation>SAC</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>Br.</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1298"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>lbs</source>
         <translation>lbs</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1310"/>
         <source>cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1344"/>
+        <location filename="../qt-ui/models.cpp" line="1325"/>
         <source>location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1316"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1338"/>
+        <location filename="../qt-ui/models.cpp" line="1319"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1341"/>
+        <location filename="../qt-ui/models.cpp" line="1322"/>
         <source>maxCNS</source>
         <translation>maxCNS</translation>
     </message>
@@ -719,114 +817,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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -834,54 +932,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"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="165"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/>
         <source>Error</source>
         <translation>Greška</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>Pokušaj ponovo</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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="339"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -949,7 +1047,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"/>
     </message>
@@ -958,848 +1056,854 @@ 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>Bilješke</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>Lokacija</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="169"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
         <source>Divemaster</source>
         <translation>Voditelj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="155"/>
+        <location filename="../qt-ui/maintab.ui" line="148"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="63"/>
-        <source>Start time</source>
-        <translation type="unfinished"/>
-    </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="127"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="223"/>
         <source>Rating</source>
         <translation>Ocjena</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="236"/>
         <source>Visibility</source>
         <translation>Vidljivost</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="215"/>
+        <location filename="../qt-ui/maintab.ui" line="127"/>
         <source>Suit</source>
         <translation>Odijelo</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>Bilješke</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="270"/>
+        <location filename="../qt-ui/maintab.ui" line="311"/>
         <source>Equipment</source>
         <translation>Oprema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="350"/>
+        <location filename="../qt-ui/maintab.ui" line="391"/>
         <source>Dive Info</source>
         <translation>Informacije o uronu</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>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="414"/>
+        <location filename="../qt-ui/maintab.ui" line="275"/>
+        <source>Time</source>
+        <translation>Vrijeme</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="455"/>
         <source>Interval</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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>SAC</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="528"/>
+        <location filename="../qt-ui/maintab.ui" line="569"/>
         <source>OTU</source>
         <translation>OTU</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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="604"/>
+        <location filename="../qt-ui/maintab.ui" line="645"/>
         <source>Dive Time</source>
         <translation>Trajanje</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="660"/>
+        <location filename="../qt-ui/maintab.ui" line="701"/>
         <source>Stats</source>
         <translation>Statistike</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="746"/>
         <source>Depth</source>
         <translation>Dubina</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="784"/>
         <source>Duration</source>
         <translation>Trajanje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Total Time</source>
         <translation>Ukupno trajanje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="835"/>
         <source>Dives</source>
         <translation>Uroni</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="919"/>
+        <source>Photos</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="89"/>
         <source>Cylinders</source>
         <translation>Boce</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="93"/>
         <source>Weights</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="42"/>
+        <location filename="../qt-ui/maintab.cpp" line="48"/>
         <source>Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="46"/>
+        <location filename="../qt-ui/maintab.cpp" line="52"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="494"/>
+        <location filename="../qt-ui/maintab.cpp" line="464"/>
         <source>unknown</source>
         <translation>nepoznato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>N</source>
-        <translation>N</translation>
+        <location filename="../qt-ui/maintab.cpp" line="501"/>
+        <source>Deepest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>S</source>
-        <translation>S</translation>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <source>Shallowest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>E</source>
-        <translation>E</translation>
+        <location filename="../qt-ui/maintab.cpp" line="794"/>
+        <source>Discard the Changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>W</source>
-        <translation>W</translation>
+        <location filename="../qt-ui/maintab.cpp" line="795"/>
+        <source>You are about to discard your changes.</source>
+        <translation type="unfinished"/>
     </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>Filter</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"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="583"/>
+        <source>Print</source>
+        <translation type="unfinished"/>
+    </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:'Courier'; 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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
         <source>&amp;Log</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="655"/>
+        <location filename="../qt-ui/mainwindow.ui" line="728"/>
         <source>New</source>
         <translation>Novi</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="666"/>
+        <location filename="../qt-ui/mainwindow.ui" line="739"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="677"/>
+        <location filename="../qt-ui/mainwindow.ui" line="750"/>
         <source>Save</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>Save as</source>
         <translation>Spremi kao</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"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Close</source>
         <translation>Zatvori</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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="806"/>
-        <source>Dive List</source>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <source>&amp;Print</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="814"/>
-        <source>Profile</source>
-        <translation>Profil</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="791"/>
+        <source>Ctrl+,</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="822"/>
-        <source>Info</source>
-        <translation>Informacije</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="799"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="830"/>
-        <source>All</source>
+        <location filename="../qt-ui/mainwindow.ui" line="810"/>
+        <source>Import from &amp;dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="872"/>
-        <source>User &amp;Manual</source>
+        <location filename="../qt-ui/mainwindow.ui" line="818"/>
+        <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="880"/>
-        <source>Globe</source>
+        <location filename="../qt-ui/mainwindow.ui" line="821"/>
+        <source>Ctrl+G</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="888"/>
-        <source>P&amp;lan Dive</source>
+        <location filename="../qt-ui/mainwindow.ui" line="826"/>
+        <source>&amp;Edit Device Names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="891"/>
-        <source>Ctrl+L</source>
+        <location filename="../qt-ui/mainwindow.ui" line="834"/>
+        <source>Ctrl++</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="907"/>
-        <source>Import from Divelogs.de</source>
+        <location filename="../qt-ui/mainwindow.ui" line="839"/>
+        <source>&amp;Renumber</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
-        <source>&amp;Check for Updates</source>
+        <location filename="../qt-ui/mainwindow.ui" line="842"/>
+        <source>Ctrl+R</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="855"/>
+        <source>&amp;Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="858"/>
+        <source>Ctrl+Y</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="929"/>
+        <source>User &amp;Manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="951"/>
-        <source>Export CSV</source>
+        <location filename="../qt-ui/mainwindow.ui" line="945"/>
+        <source>P&amp;lan Dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="726"/>
+        <location filename="../qt-ui/mainwindow.ui" line="948"/>
+        <source>Ctrl+L</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1003"/>
+        <source>&amp;Check for Updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="783"/>
         <source>Ctrl+P</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="731"/>
-        <source>Preferences</source>
-        <translation>Postavke</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="774"/>
-        <source>Add Dive</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="793"/>
-        <source>Auto Group</source>
-        <translation type="unfinished"/>
-    </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="838"/>
-        <source>Prev DC</source>
-        <translation>Prethodno računalo</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="846"/>
-        <source>Next DC</source>
-        <translation>Sljedeće računalo</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="854"/>
-        <source>Select Events</source>
-        <translation>Odaberi događaje</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <location filename="../qt-ui/mainwindow.ui" line="916"/>
         <source>Input Plan</source>
         <translation>Unesi plan urona</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="864"/>
-        <source>About Subsurface</source>
-        <translation>O programu Subsurface</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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <location filename="../qt-ui/mainwindow.ui" line="978"/>
         <source>F11</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="174"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
         <source>Open File</source>
         <translation>Otvori datoteku</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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="652"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="717"/>
         <source>Save Changes?</source>
         <translation>Spremi promjene?</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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="280"/>
-        <source>Export UDDF File as</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="281"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="289"/>
-        <source>Export CSV File as</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="290"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="299"/>
-        <source>Export World Map</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="300"/>
-        <source>HTML files (*.html)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="449"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="514"/>
         <source>Yearly Statistics</source>
         <translation>Godišnje statistike</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="961"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1076"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1199"/>
         <source>Open Dive Log File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1225"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>PlannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Last stop at 20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="416"/>
+        <source>Last stop at 6m</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>PreferencesDialog</name>
     <message>
         <location filename="../qt-ui/preferences.ui" line="85"/>
@@ -1822,247 +1926,297 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="141"/>
+        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <source>Network</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="151"/>
         <source>Lists and Tables</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="170"/>
+        <location filename="../qt-ui/preferences.ui" line="180"/>
         <source>Dives</source>
         <translation>Uroni</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="188"/>
+        <location filename="../qt-ui/preferences.ui" line="198"/>
         <source>...</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <location filename="../qt-ui/preferences.ui" line="247"/>
         <source>Animations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <location filename="../qt-ui/preferences.ui" line="253"/>
         <source>Speed</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="312"/>
+        <source>Reset all settings to their default value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
         <source>System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="348"/>
         <source>Metric</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="333"/>
+        <location filename="../qt-ui/preferences.ui" line="358"/>
         <source>Imperial</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="343"/>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
         <source>Personalize</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="392"/>
         <source>Depth</source>
         <translation>Dubina</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="409"/>
         <source>feet</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="401"/>
+        <location filename="../qt-ui/preferences.ui" line="426"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="411"/>
+        <location filename="../qt-ui/preferences.ui" line="436"/>
         <source>psi</source>
         <translation>psi</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="455"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>celsius</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="465"/>
+        <location filename="../qt-ui/preferences.ui" line="490"/>
         <source>fahrenheit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="482"/>
+        <location filename="../qt-ui/preferences.ui" line="507"/>
         <source>kg</source>
         <translation>kg</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"/>
     </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"/>
     </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"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="817"/>
+        <source>Proxy type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="830"/>
+        <source>Host</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="657"/>
+        <location filename="../qt-ui/preferences.ui" line="856"/>
+        <source>Port</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="882"/>
+        <source>Requires authentication</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="925"/>
+        <source>Password</source>
+        <translation>Lozinka</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="682"/>
         <source>draw dive computer reported ceiling red</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="767"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="419"/>
         <source>Pressure</source>
         <translation>Pritisak</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="448"/>
+        <location filename="../qt-ui/preferences.ui" line="473"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="475"/>
+        <location filename="../qt-ui/preferences.ui" line="500"/>
         <source>Weight</source>
         <translation>Težina</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="517"/>
         <source>lbs</source>
         <translation>lbs</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="520"/>
+        <location filename="../qt-ui/preferences.ui" line="545"/>
         <source>Minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="530"/>
+        <location filename="../qt-ui/preferences.ui" line="555"/>
         <source>Seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="562"/>
+        <location filename="../qt-ui/preferences.ui" line="587"/>
         <source>Show</source>
         <translation type="unfinished"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="693"/>
         <source>Show non-used cylinders in Equipment Tab</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="691"/>
+        <location filename="../qt-ui/preferences.ui" line="716"/>
         <source>Misc</source>
         <translation type="unfinished"/>
     </message>
@@ -2072,35 +2226,65 @@ Please, remove them first.</source>
         <translation>Postavke</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="739"/>
         <source>GFHigh</source>
         <translation type="unfinished"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="24"/>
+        <source>System proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="25"/>
+        <source>HTTP proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="26"/>
+        <source>SOCKS proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="245"/>
         <source>Restart required</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="394"/>
+        <source>Warning</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
 </context>
 <context>
     <name>PrintDialog</name>
@@ -2241,72 +2425,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>nepoznato</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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1920"/>
+        <location filename="../qt-ui/models.cpp" line="1900"/>
         <source>SAC:</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1924"/>
+        <location filename="../qt-ui/models.cpp" line="1904"/>
         <source>Weights:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1929"/>
+        <location filename="../qt-ui/models.cpp" line="1909"/>
         <source>Notes:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1936"/>
+        <location filename="../qt-ui/models.cpp" line="1916"/>
         <source>Divemaster:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1938"/>
+        <location filename="../qt-ui/models.cpp" line="1918"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1940"/>
+        <location filename="../qt-ui/models.cpp" line="1920"/>
         <source>Suit:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1942"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>Viz:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1944"/>
+        <location filename="../qt-ui/models.cpp" line="1924"/>
         <source>Rating:</source>
         <translation type="unfinished"/>
     </message>
@@ -2314,62 +2498,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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/>
+        <source>Make first divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="906"/>
+        <source>Delete this divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="913"/>
         <source>Add Gas Change</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -2377,12 +2576,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>Zrak</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"/>
     </message>
@@ -2392,22 +2591,22 @@ Please, remove them first.</source>
         <translation>Zatvori</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="34"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation>Ø</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="37"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation>Min.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="40"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation>Max.</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"/>
     </message>
@@ -2421,9 +2620,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>Novi početni broj</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="126"/>
+        <source>New number</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchBar</name>
+    <message>
+        <location filename="../qt-ui/searchbar.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ShiftImageTimesDialog</name>
@@ -2438,42 +2651,47 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="105"/>
         <source>earlier</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="109"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="112"/>
         <source>later</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -2553,42 +2771,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>Web servis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/>
         <source>Connecting...</source>
         <translation>Spajanje...</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/>
         <source>Connection Error: </source>
         <translation>Greška u komunikaciji: </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>Neispravna korisnička oznaka</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>Ne mogu obraditi odziv</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/>
         <source>Download Success!</source>
         <translation>Preuzimanje uspješno!</translation>
     </message>
@@ -2604,17 +2822,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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2622,7 +2840,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"/>
     </message>
@@ -2630,42 +2848,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"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="37"/>
-        <source>&lt;h3&gt;Subsurface was unable to check for updates.&lt;/h3&gt;</source>
+        <location filename="../qt-ui/updatemanager.cpp" line="36"/>
+        <source>Subsurface was unable to check for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
-        <source>&lt;br/&gt;&lt;b&gt;The following error occurred:&lt;/b&gt;&lt;br/&gt;</source>
+        <location filename="../qt-ui/updatemanager.cpp" line="41"/>
+        <source>The following error occurred:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="43"/>
-        <source>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Please check your internet connection.&lt;/b&gt;</source>
+        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
+        <source>Please check your internet connection.</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -2673,25 +2891,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>Korisnički priručnik</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"/>
     </message>
 </context>
 <context>
+    <name>UserSurvey</name>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="47"/>
+        <source>Subsurface User Survey</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="79"/>
+        <source>Recreational DIver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="92"/>
+        <source>Tech Diver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="105"/>
+        <source>Interested in dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="118"/>
+        <source>I am downloading dives from supported dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="131"/>
+        <source>I am importing dives from other software / sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="144"/>
+        <source>I am manually entering dives</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="190"/>
+        <source>Please type suggestions (in English) in the following box</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="27"/>
+        <source>
+Operating System: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="30"/>
+        <source>
+CPU Architecture: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="35"/>
+        <source>
+OS CPU Architecture %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="39"/>
+        <source>
+Language: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="73"/>
+        <source>Should we ask you later?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="74"/>
+        <source>Don&apos;t ask me again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="75"/>
+        <source>Ask Later</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="76"/>
+        <source>Ask again?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <source>Submit User Survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <source>Subsurface was unable to submit the user survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="101"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="102"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="111"/>
+        <source>Survey successfully submitted.</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="723"/>
+        <location filename="../qt-ui/models.cpp" line="721"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2739,12 +3095,12 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </message>
@@ -2752,37 +3108,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>Vrsta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="368"/>
+        <location filename="../qt-ui/models.cpp" line="373"/>
         <source>Weight</source>
         <translation>Težina</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="453"/>
+        <location filename="../qt-ui/models.cpp" line="458"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="454"/>
+        <location filename="../qt-ui/models.cpp" line="459"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="478"/>
+        <location filename="../qt-ui/models.cpp" line="483"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="484"/>
         <source>m</source>
         <translation>m</translation>
     </message>
@@ -2790,70 +3146,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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>#</source>
         <translation>Br.</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>
 Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>
 Shortest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>
 Longest</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
@@ -2862,99 +3218,92 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="58"/>
+        <location filename="../dive.c" line="87"/>
         <source>pascal</source>
         <translation>Pa</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>bar</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>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="104"/>
-        <location filename="../qt-gui.cpp" line="292"/>
-        <source>l</source>
-        <translation>l</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>cuft</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>m</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>ft</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>lbs</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>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1120"/>
+        <location filename="../dive.c" line="1237"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) ili (%s)</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>zrak</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="170"/>
+        <location filename="../equipment.c" line="210"/>
         <source>integrated</source>
         <translation>integrirani</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="171"/>
+        <location filename="../equipment.c" line="211"/>
         <source>belt</source>
         <translation>pojas</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="172"/>
+        <location filename="../equipment.c" line="212"/>
         <source>ankle</source>
         <translation>gležanj</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="173"/>
+        <location filename="../equipment.c" line="213"/>
         <source>backplate weight</source>
         <translation>backplate olova</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="174"/>
+        <location filename="../equipment.c" line="214"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -2971,253 +3320,253 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>none</source>
         <translation>nijedan</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>deco stop</source>
         <translation>deko zastoj</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ascent</source>
         <translation>izron</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ceiling</source>
         <translation>strop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>workload</source>
         <translation>opterećenje</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>transmitter</source>
         <translation>odašiljač</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>violation</source>
         <translation>povreda</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>bookmark</source>
         <translation>bookmark</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>surface</source>
         <translation>površina</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>safety stop</source>
         <translation>sigurnosna stanka</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>promjena plina</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (voluntary)</source>
         <translation>sigurnosna stanka (opcionalna)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (mandatory)</source>
         <translation>sigurnosna stanka (obavezna)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>deepstop</source>
         <translation>dubinska stanka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>ceiling (safety stop)</source>
         <translation>strop (sigurnosni zastoj)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>divetime</source>
         <translation>trajanje urona</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"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>maxdepth</source>
         <translation>Max dubina</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>airtime</source>
         <translation>preostalo trajanje zraka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>heading</source>
         <translation>kurs</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>tissue level warning</source>
         <translation>upozorenje tkivo</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>non stop time</source>
         <translation>non stop vrijeme</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="163"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>invalid event number</source>
         <translation>neispravan broj događaja</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>Ne mogu kreirati parser za %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="411"/>
+        <location filename="../libdivecomputer.c" line="414"/>
         <source>Error registering the data</source>
         <translation>Greška pri registraciji podataka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="419"/>
+        <location filename="../libdivecomputer.c" line="422"/>
         <source>Error parsing the datetime</source>
         <translation>Greška pri parsiranju datuma i vremena</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="438"/>
         <source>Dive %d: %s %d %04d</source>
         <translation>Uron #%d - %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="440"/>
+        <location filename="../libdivecomputer.c" line="443"/>
         <source>Error parsing the divetime</source>
         <translation>Greška pri parsiranju vremena urona</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="449"/>
+        <location filename="../libdivecomputer.c" line="452"/>
         <source>Error parsing the maxdepth</source>
         <translation>Greška pri parsiranju maksimalne dubine</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="458"/>
+        <location filename="../libdivecomputer.c" line="461"/>
         <source>Error parsing the gas mix count</source>
         <translation>Greška pri parsiranju broja mješavina</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="470"/>
+        <location filename="../libdivecomputer.c" line="473"/>
         <source>Error obtaining water salinity</source>
         <translation>Greška pri dohvaćanju saliniteta vode</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the gas mix</source>
         <translation>Greška pri parsiranju mješavine plinova</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="493"/>
+        <location filename="../libdivecomputer.c" line="496"/>
         <source>Error parsing the samples</source>
         <translation>Greška pri parsiranju uzoraka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="623"/>
+        <location filename="../libdivecomputer.c" line="626"/>
         <source>Event: waiting for user action</source>
         <translation>Događaj: čekanje na korisničku akciju</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>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="691"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the event handler.</source>
         <translation>Greška pri registraciji event handlera.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="696"/>
+        <location filename="../libdivecomputer.c" line="699"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Greška pri registraciji cancellation handlera</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="717"/>
+        <location filename="../libdivecomputer.c" line="720"/>
         <source>Dive data import error</source>
         <translation>Greška pri uvozu podataka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="756"/>
+        <location filename="../libdivecomputer.c" line="759"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Ne mogu kreirati libdivecomputer kontekst</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="763"/>
+        <location filename="../libdivecomputer.c" line="766"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Nije uspjelo otvaranje %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="462"/>
+        <location filename="../parse-xml.c" line="466"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Neobično očitanje postotka %s
 </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>Nije uspjelo parsiranje &apos;%s&apos;</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>Neuspjeo get_events na bazi.
 </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"/>
@@ -3230,562 +3579,605 @@ Maximum</source>
 </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 '%s'.
 </source>
         <translation>Neuspjeo upit na bazu &apos;%s&apos;.
 </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="146"/>
-        <location filename="../planner.c" line="617"/>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation>Ne mogu naći plin %d/%d</translation>
+        <location filename="../planner.c" line="159"/>
+        <location filename="../planner.c" line="752"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="308"/>
+        <location filename="../planner.c" line="345"/>
         <source>Too many gas mixes</source>
         <translation>Previše mješavina plinova</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="489"/>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation>%s
-Subsurface plan urona
-temeljen na GFlow = %.0f i GFhigh = %.0f
-
-</translation>
+        <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>UPOZORENJE: OVO JE NOVA IMPLEMENTACIJA BUHLMANN ALGORITMA I PLANERA TEMELJENOG NA NJEMU KOJA JE SAMO DJELOMIČNO TESTIRANA. NIKAKO SE NE PREPORUČA PLANIRANJE URONA TEMELJEM SAMO OVIH INFORMACIJA.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="530"/>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Prelazak na %.*f %s u %d:%02d min - ukupno vrijeme %d:%02u na %s
-</translation>
+        <location filename="../planner.c" line="535"/>
+        <source>based on GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="539"/>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Stanka na %.*f %s u trajanju %d:%02d min - Ukupno vrijeme %d:%02u na %s
-</translation>
+        <location filename="../planner.c" line="538"/>
+        <source>Subsurface dive plan</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="550"/>
-        <source>Switch gas to %s
-</source>
-        <translation>Prebaci plin na %s
-</translation>
+        <location filename="../planner.c" line="542"/>
+        <source>depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="558"/>
-        <source>Gas consumption:
-</source>
-        <translation>Potrošnja plina:
-</translation>
+        <location filename="../planner.c" line="545"/>
+        <source>runtime</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="569"/>
-        <source>%.0f%s of %s
-</source>
-        <translation>%.0f%s %s
-</translation>
+        <location filename="../planner.c" line="548"/>
+        <source>duration</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="810"/>
+        <location filename="../planner.c" line="551"/>
+        <source>gas</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="606"/>
+        <source>%3.0f%s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
+        <source>%3dmin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="629"/>
+        <source>Switch gas to %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="638"/>
+        <source>Gas consumption:</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="659"/>
+        <source>this is more gas than available in the specified cylinder!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="664"/>
+        <source>not enough reserve for gas sharing on ascent!</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="668"/>
+        <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="980"/>
         <source>ean</source>
         <translation>ean</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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1229"/>
+        <location filename="../profile.c" line="1253"/>
         <source>P: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1233"/>
+        <location filename="../profile.c" line="1257"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1263"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1244"/>
+        <location filename="../profile.c" line="1268"/>
         <source>CNS: %u%%
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1246"/>
+        <location filename="../profile.c" line="1270"/>
         <source>pO%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1272"/>
         <source>pN%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="1274"/>
         <source>pHe: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="1277"/>
         <source>MOD: %d%s
 </source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1276"/>
+        <location filename="../profile.c" line="1300"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1279"/>
+        <location filename="../profile.c" line="1303"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="1308"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
+        <location filename="../profile.c" line="1311"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1291"/>
+        <location filename="../profile.c" line="1315"/>
         <source>In deco
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1293"/>
+        <location filename="../profile.c" line="1317"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1297"/>
+        <location filename="../profile.c" line="1321"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1305"/>
+        <location filename="../profile.c" line="1329"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1307"/>
+        <location filename="../profile.c" line="1331"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1310"/>
+        <location filename="../profile.c" line="1334"/>
         <source>TTS: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1313"/>
+        <location filename="../profile.c" line="1337"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1319"/>
+        <location filename="../profile.c" line="1343"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1325"/>
+        <location filename="../profile.c" line="1349"/>
         <source>heartbeat: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1327"/>
+        <location filename="../profile.c" line="1351"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1419"/>
+        <location filename="../profile.c" line="1443"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1435"/>
+        <location filename="../profile.c" line="1459"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1439"/>
+        <location filename="../profile.c" line="1463"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1454"/>
+        <location filename="../profile.c" line="1478"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="273"/>
+        <location filename="../qt-gui.cpp" line="281"/>
         <source>C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="276"/>
+        <location filename="../qt-gui.cpp" line="284"/>
         <source>F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="392"/>
-        <source>%1, %2 %3, %4 %5:%6</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="405"/>
-        <source>%1 %2, %3
-%4:%5</source>
-        <translation type="unfinished"/>
-    </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>boat</source>
         <translation>brod</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>shore</source>
         <translation>obala</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>drift</source>
         <translation>drift</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>deep</source>
         <translation>dubok</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>cavern</source>
         <translation>pećina</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>ice</source>
         <translation>led</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>wreck</source>
         <translation>olupina</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>cave</source>
         <translation>špilja</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>altitude</source>
         <translation>nadmorska visina</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>pool</source>
         <translation>bazen</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>lake</source>
         <translation>jezero</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>river</source>
         <translation>rijeka</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>night</source>
         <translation>noć</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>fresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>student</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>photo</source>
         <translation>fotografija</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>video</source>
         <translation>video</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>instructor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="25"/>
         <source>deco</source>
         <translation>deko</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="216"/>
+        <location filename="../dive.c" line="133"/>
+        <source>ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="214"/>
         <source>more than %d days</source>
         <translation>više od %d dana</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="220"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="224"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dh %dmin</source>
         <translation>%dst %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="235"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation>za urone #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="242"/>
+        <location filename="../statistics.c" line="240"/>
         <source>for selected dives</source>
         <translation>za odabrane urone</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="275"/>
         <source>for dive #%d</source>
         <translation>za uron #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for selected dive</source>
         <translation>za odabrani uron</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for all dives</source>
         <translation>za sve urone</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="283"/>
+        <location filename="../statistics.c" line="281"/>
         <source>(no dives)</source>
         <translation>(nema urona)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sun</source>
         <translation>Ned</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Mon</source>
         <translation>Pon</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Tue</source>
         <translation>Uto</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Wed</source>
         <translation>Sri</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Thu</source>
         <translation>Čet</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Fri</source>
         <translation>Pet</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sat</source>
         <translation>Sub</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jan</source>
         <translation>Sij</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Feb</source>
         <translation>Velj</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Mar</source>
         <translation>Ožu</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Apr</source>
         <translation>Tra</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>May</source>
         <translation>Svi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jun</source>
         <translation>Lip</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Jul</source>
         <translation>Srp</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Aug</source>
         <translation>Kol</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Sep</source>
         <translation>Ruj</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Oct</source>
         <translation>Lis</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Nov</source>
         <translation>Stu</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Dec</source>
         <translation>Pro</translation>
     </message>
@@ -3815,97 +4207,97 @@ Is the Uemis Zurich plugged in correctly?</source>
 Je li Uemis Zurich ispravno priključen?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="107"/>
+        <location filename="../uemis-downloader.c" line="111"/>
         <source>unknown</source>
         <translation>nepoznato</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="379"/>
+        <location filename="../uemis-downloader.c" line="383"/>
         <source>Reading %s %s</source>
         <translation>Čitanje %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="399"/>
+        <location filename="../uemis-downloader.c" line="403"/>
         <source>data</source>
         <translation>podaci</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="420"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>divelog entry id</source>
         <translation>ID unosa u dnevniku</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="422"/>
+        <location filename="../uemis-downloader.c" line="426"/>
         <source>divespot data id</source>
         <translation>divespot data id</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
+        <location filename="../uemis-downloader.c" line="428"/>
         <source>more data dive id</source>
         <translation>više podataka za ID urona</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>wetsuit</source>
         <translation>mokro odijelo</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>semidry</source>
         <translation>polusuho</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>drysuit</source>
         <translation>suho odijelo</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>shorty</source>
         <translation>shorty</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>vest</source>
         <translation>jakna</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>long john</source>
         <translation>long john</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>jacket</source>
         <translation>kompenzator plovnosti</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>full suit</source>
         <translation>puno odijelo</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>2 pcs full suit</source>
         <translation>dvodjelno odijelo</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="620"/>
+        <location filename="../uemis-downloader.c" line="624"/>
         <source>membrane</source>
         <translation>membrana</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="802"/>
+        <location filename="../uemis-downloader.c" line="823"/>
         <source>Init Communication</source>
         <translation>Uspostavljanje veze</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="804"/>
+        <location filename="../uemis-downloader.c" line="825"/>
         <source>Uemis init failed</source>
         <translation>Uemis greška pri inicijalizaciji</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="815"/>
+        <location filename="../uemis-downloader.c" line="836"/>
         <source>Start download</source>
         <translation>Započni preuzimanje</translation>
     </message>
@@ -3926,18 +4318,18 @@ Je li Uemis Zurich ispravno priključen?</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="203"/>
-        <source>PO2 Green Warning</source>
-        <translation>Upozorenje: PO2 Zeleno</translation>
+        <source>pO₂ Green Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
-        <source>PO2 Ascend Warning</source>
-        <translation>Upozorenje: Prebrzi izron / PO2</translation>
+        <source>pO₂ Ascend Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="208"/>
-        <source>PO2 Ascend Alarm</source>
-        <translation>Alarm: Prebrzi izron / PO2</translation>
+        <source>pO₂ Ascend Alarm</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
@@ -3999,5 +4391,214 @@ Je li Uemis Zurich ispravno priključen?</translation>
         <source>Low Battery Alert</source>
         <translation>Alarm: Baterija pri izmaku</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"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="36"/>
+        <source>Date:</source>
+        <translation>Datum:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="38"/>
+        <source>Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="40"/>
+        <source>Duration:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="41"/>
+        <source>min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="43"/>
+        <source>Max Depth:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="46"/>
+        <source>Air Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="48"/>
+        <source>Water Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="50"/>
+        <source>Location:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="54"/>
+        <source>Notes:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>plannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="35"/>
+        <source>Rates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="56"/>
+        <source>Ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="77"/>
+        <source>below 75% avg. depth</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="94"/>
+        <source>75%-50% avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="111"/>
+        <source>50% avg. depth - 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="128"/>
+        <source>6m/20ft to surface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="148"/>
+        <source>Descent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="200"/>
+        <source>surface to the bottom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="226"/>
+        <source>Planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="247"/>
+        <source>GF low</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="264"/>
+        <source>GF high</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
+        <source>Drop to first depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
+        <source>Last Stop at 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>plan backgas breaks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="318"/>
+        <source>Gas Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <source>bottom SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="349"/>
+        <source>deco SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="359"/>
+        <source>bottom pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="389"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="382"/>
+        <source>deco pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="421"/>
+        <source>Dive Notes</source>
+        <translation>Bilješke</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="445"/>
+        <source>display runtime</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="458"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="461"/>
+        <source>display segment duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="471"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="474"/>
+        <source>display transitions in deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="481"/>
+        <source>verbatim diveplan</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_hu.ts b/translations/subsurface_hu.ts
index 6cac2858f..fef5df702 100644
--- a/translations/subsurface_hu.ts
+++ b/translations/subsurface_hu.ts
@@ -1,82 +1,81 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="hu">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="hu" version="2.0">
+<defaultcodec>UTF-8</defaultcodec>
 <context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Type</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
         <source>WorkPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
         <source>StartPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
         <source>EndPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
         <source>He%</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
         <source>O</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -89,225 +88,361 @@
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
         <source>Remove the selected Dive Computer?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>Típús</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>
+        <translation type="unfinished"/>
     </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>kezdés</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>befejezés</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>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <source>/min</source>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
-        <source>save As</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/divelistview.cpp" line="744"/>
+        <source>renumber dive(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="763"/>
-        <source>export As UDDF</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <source>shift times</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="764"/>
-        <source>export As CSV</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <source>load images</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="765"/>
-        <source>shift times</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Open Image Files</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="766"/>
-        <source>load images</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <source>merge selected dives</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DiveLogExportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
+        <source>Export Dive Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="24"/>
+        <source>General Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="30"/>
+        <source>Export format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="42"/>
+        <source>Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="61"/>
+        <source>UDDF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="74"/>
+        <source>divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="84"/>
+        <source>CSV</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="94"/>
+        <source>Worldmap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="107"/>
+        <source>Selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="116"/>
+        <source>Selected dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="126"/>
+        <source>All dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="178"/>
+        <source>HTML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="184"/>
+        <source>General Settings</source>
+        <translation>Általános Beállítások</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="190"/>
+        <source>Subsurface Numbers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="203"/>
+        <source>Selected Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="216"/>
+        <source>Minimum Javascript</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="229"/>
+        <source>All Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="239"/>
+        <source>Export List only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="252"/>
+        <source>Style Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="264"/>
+        <source>Font</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="274"/>
+        <source>Font size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
+        <source>8</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <source>10</source>
+        <translation>10</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <source>12</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <source>14</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <source>16</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <source>18</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <source>20</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="323"/>
+        <source>Theme</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="769"/>
-        <source>upload dive(s) to divelogs.de</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="795"/>
-        <source>Save Dives As...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <source>Sand</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="814"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="153"/>
         <source>Export UDDF File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Open Image Files</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="162"/>
+        <source>Export World Map</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="163"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="177"/>
+        <source>HTML files (*.html)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="760"/>
-        <source>merge selected dives</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="167"/>
+        <source>Export Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="168"/>
+        <source>XML files (*.xml *.ssrf)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="176"/>
+        <source>Export HTML files as</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -315,266 +450,227 @@
     <message>
         <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
         <source>Import dive log file</source>
-        <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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="80"/>
         <source>Depth</source>
         <translation>Mélység</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>Idő</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="317"/>
         <source>Date</source>
         <translation>Dátum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="385"/>
         <source>Duration</source>
         <translation>Tartam</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
         <source>Location</source>
         <translation>Hely</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="368"/>
         <source>Buddy</source>
         <translation>Társ</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="78"/>
-        <source>GFHigh</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="98"/>
-        <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/diveplanner.ui" line="106"/>
+        <source>Planned Dive Time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="125"/>
-        <source>Last Stop at 6m</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/diveplanner.ui" line="134"/>
+        <source>Altitude</source>
+        <translation type="unfinished"/>
     </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>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="116"/>
-        <source>30ft</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="363"/>
-        <source>Handler Position Error</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/diveplanner.ui" line="148"/>
+        <source>mbar</source>
+        <translation type="unfinished"/>
     </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>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/diveplanner.ui" line="158"/>
+        <source>m</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="445"/>
-        <source>AIR</source>
-        <translation>LÉG</translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="137"/>
+        <source>unknown</source>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1152"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="590"/>
         <source>Duration</source>
         <translation>Tartam</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -592,300 +688,300 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="97"/>
         <source>Pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="99"/>
         <source>Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/>
         <source>Color</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
         <source>User Entered</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
         <source>Cylinder Index</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
-        <source>Pressure  S</source>
-        <translation type="unfinished"></translation>
+        <source>Pressure S</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
-        <source>Pressure I</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <source>pN₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
-        <source>Ceiling</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>pHe</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
-        <source>SAC</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>pO₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
-        <source>PN2</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <source>Pressure I</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
-        <source>PHE</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <source>Ceiling</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
-        <source>PO2</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <source>SAC</source>
+        <translation type="unfinished"/>
     </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>#</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="165"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/>
         <source>Error</source>
         <translation>Hiba</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -898,24 +994,24 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
         <source>Vendor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
         <source>Dive Computer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
         <source>Device or Mount Point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="132"/>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="139"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
@@ -925,880 +1021,886 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
         <source>Always prefer downloaded dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
         <source>Save libdivecomputer logfile</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
         <source>Save libdivecomputer dumpfile</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <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>Merülés Jegyzetek</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>Hely</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="169"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
         <source>Divemaster</source>
         <translation>Merülés vezető</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="155"/>
+        <location filename="../qt-ui/maintab.ui" line="148"/>
         <source>Buddy</source>
         <translation>Társ</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="270"/>
+        <location filename="../qt-ui/maintab.ui" line="311"/>
         <source>Equipment</source>
         <translation>Felszerelés</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="350"/>
+        <location filename="../qt-ui/maintab.ui" line="391"/>
         <source>Dive Info</source>
         <translation>Merülés Infó</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>Dátum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="414"/>
+        <location filename="../qt-ui/maintab.ui" line="275"/>
+        <source>Time</source>
+        <translation>Idő</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="455"/>
         <source>Interval</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="604"/>
+        <location filename="../qt-ui/maintab.ui" line="645"/>
         <source>Dive Time</source>
         <translation>Merülés Idő</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="746"/>
         <source>Depth</source>
         <translation>Mélység</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="784"/>
         <source>Duration</source>
         <translation>Tartam</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="835"/>
         <source>Dives</source>
         <translation>Merülések</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="919"/>
+        <source>Photos</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="89"/>
         <source>Cylinders</source>
         <translation>Palackok</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="42"/>
+        <location filename="../qt-ui/maintab.cpp" line="48"/>
         <source>Save</source>
         <translation>Ment</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>N</source>
-        <translation>N</translation>
+        <location filename="../qt-ui/maintab.cpp" line="501"/>
+        <source>Deepest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>S</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <source>Shallowest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>E</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/maintab.cpp" line="794"/>
+        <source>Discard the Changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>W</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/maintab.cpp" line="795"/>
+        <source>You are about to discard your changes.</source>
+        <translation type="unfinished"/>
     </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>Szűrő</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>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="594"/>
+        <location filename="../qt-ui/mainwindow.ui" line="583"/>
+        <source>Print</source>
+        <translation type="unfinished"/>
+    </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:'Courier'; 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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
         <source>&amp;Log</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="655"/>
+        <location filename="../qt-ui/mainwindow.ui" line="728"/>
         <source>New</source>
         <translation>Új</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="677"/>
+        <location filename="../qt-ui/mainwindow.ui" line="750"/>
         <source>Save</source>
         <translation>Ment</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>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="758"/>
+        <source>Sa&amp;ve as</source>
+        <translation type="unfinished"/>
     </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="761"/>
         <source>Save as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"/>
     </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="772"/>
         <source>Close</source>
         <translation>Bezárás</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>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <source>P&amp;references</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="831"/>
+        <source>&amp;Add Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="902"/>
+        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <source>Auto &amp;Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="863"/>
+        <source>&amp;Dive List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="871"/>
+        <source>&amp;Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="879"/>
+        <source>&amp;Info</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="887"/>
+        <source>&amp;All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="895"/>
+        <source>P&amp;rev DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="903"/>
+        <source>&amp;Next DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="911"/>
+        <source>&amp;Select Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <source>&amp;About Subsurface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="937"/>
+        <source>&amp;Globe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="953"/>
+        <source>&amp;Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="959"/>
         <source>Ctrl+I</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1008"/>
+        <source>&amp;Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="707"/>
-        <source>Export &amp;UDDF</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/mainwindow.ui" line="1011"/>
+        <source>Export Dive Logs</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1014"/>
+        <source>Ctrl+E</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Enable the pN2 Graph</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <location filename="../qt-ui/mainwindow.ui" line="128"/>
         <source>Enable the pHe graph</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <location filename="../qt-ui/mainwindow.ui" line="290"/>
         <source>Show/hide heart rate</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <location filename="../qt-ui/mainwindow.ui" line="342"/>
         <source>Enable EAD, END, and EADD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="238"/>
         <source>Show NDL / TTS</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="456"/>
+        <location filename="../qt-ui/mainwindow.ui" line="394"/>
         <source>Rescale depth axis</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="710"/>
-        <source>Ctrl+U</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="715"/>
-        <source>Export HTML World Map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="718"/>
-        <source>Ctrl+H</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="723"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="734"/>
+        <location filename="../qt-ui/mainwindow.ui" line="791"/>
         <source>Ctrl+,</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="742"/>
+        <location filename="../qt-ui/mainwindow.ui" line="799"/>
         <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="753"/>
+        <location filename="../qt-ui/mainwindow.ui" line="810"/>
         <source>Import from &amp;dive computer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="818"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="764"/>
+        <location filename="../qt-ui/mainwindow.ui" line="821"/>
         <source>Ctrl+G</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="826"/>
         <source>&amp;Edit Device Names</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="834"/>
         <source>Ctrl++</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="782"/>
+        <location filename="../qt-ui/mainwindow.ui" line="839"/>
         <source>&amp;Renumber</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="785"/>
+        <location filename="../qt-ui/mainwindow.ui" line="842"/>
         <source>Ctrl+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="798"/>
+        <location filename="../qt-ui/mainwindow.ui" line="855"/>
         <source>&amp;Yearly Statistics</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="801"/>
+        <location filename="../qt-ui/mainwindow.ui" line="858"/>
         <source>Ctrl+Y</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="806"/>
-        <source>Dive List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="814"/>
-        <source>Profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="822"/>
-        <source>Info</source>
-        <translation>Infó</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="830"/>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="872"/>
+        <location filename="../qt-ui/mainwindow.ui" line="929"/>
         <source>User &amp;Manual</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="880"/>
-        <source>Globe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="888"/>
+        <location filename="../qt-ui/mainwindow.ui" line="945"/>
         <source>P&amp;lan Dive</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="891"/>
+        <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="907"/>
-        <source>Import from Divelogs.de</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <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="951"/>
-        <source>Export CSV</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="726"/>
+        <location filename="../qt-ui/mainwindow.ui" line="783"/>
         <source>Ctrl+P</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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"/>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="131"/>
+        <location filename="../qt-ui/mainwindow.ui" line="157"/>
+        <location filename="../qt-ui/mainwindow.ui" line="186"/>
+        <location filename="../qt-ui/mainwindow.ui" line="215"/>
+        <location filename="../qt-ui/mainwindow.ui" line="241"/>
+        <location filename="../qt-ui/mainwindow.ui" line="267"/>
+        <location filename="../qt-ui/mainwindow.ui" line="293"/>
+        <location filename="../qt-ui/mainwindow.ui" line="319"/>
+        <location filename="../qt-ui/mainwindow.ui" line="345"/>
+        <location filename="../qt-ui/mainwindow.ui" line="371"/>
+        <location filename="../qt-ui/mainwindow.ui" line="397"/>
+        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>Terv Megadás</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="864"/>
-        <source>About Subsurface</source>
-        <translation>A Subsurface-ről</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="896"/>
-        <source>Import Log Files</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/mainwindow.ui" line="956"/>
+        <source>Import divelog files from other applications</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="899"/>
-        <source>Import divelog files from other applications</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/mainwindow.ui" line="964"/>
+        <source>Import &amp;from Divelogs.de</source>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
-        <translation type="unfinished"></translation>
+        <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"/>
     </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>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/mainwindow.cpp" line="419"/>
+        <source>Print runtime table</source>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="300"/>
-        <source>HTML files (*.html)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="449"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="514"/>
         <source>Yearly Statistics</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="961"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1076"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1199"/>
         <source>Open Dive Log File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1107"/>
+        <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>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PlannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Last stop at 20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="416"/>
+        <source>Last stop at 6m</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1806,302 +1908,382 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="85"/>
         <source>Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="95"/>
         <source>Units</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="105"/>
         <source>Graph</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="115"/>
         <source>Language</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <source>Network</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="141"/>
+        <location filename="../qt-ui/preferences.ui" line="151"/>
         <source>Lists and Tables</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="170"/>
+        <location filename="../qt-ui/preferences.ui" line="180"/>
         <source>Dives</source>
         <translation>Merülések</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="188"/>
+        <location filename="../qt-ui/preferences.ui" line="198"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="312"/>
+        <source>Reset all settings to their default value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="392"/>
         <source>Depth</source>
         <translation>Mélység</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="811"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="817"/>
+        <source>Proxy type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="830"/>
+        <source>Host</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="856"/>
+        <source>Port</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="882"/>
+        <source>Requires authentication</source>
+        <translation type="unfinished"/>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="636"/>
-        <source>max ppO₂ when showing MOD</source>
-        <translation type="unfinished"></translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="657"/>
+        <location filename="../qt-ui/preferences.ui" line="925"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="682"/>
         <source>draw dive computer reported ceiling red</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="767"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>Filter</source>
         <translation>Szűrő</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="693"/>
         <source>Show non-used cylinders in Equipment Tab</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="14"/>
         <source>Preferences</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="23"/>
+        <source>No proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="24"/>
+        <source>System proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="25"/>
+        <source>HTTP proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="26"/>
+        <source>SOCKS proxy</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="245"/>
         <source>Restart required</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="394"/>
+        <source>Warning</source>
+        <translation type="unfinished"/>
+    </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"/>
     </message>
 </context>
 <context>
@@ -2109,17 +2291,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="46"/>
         <source>&amp;Preview</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="43"/>
         <source>P&amp;rint</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="59"/>
         <source>Print</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2165,22 +2347,22 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="23"/>
         <source>Print options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="41"/>
         <source>Print only selected dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="60"/>
         <source>Print in color</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="86"/>
         <source>Print type</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="116"/>
@@ -2195,198 +2377,213 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="145"/>
         <source>Table print</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="162"/>
         <source>Ordering</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="180"/>
         <source>Profile on top</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="202"/>
         <source>Notes on top</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="219"/>
         <source>Sizing heights (% of layout)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="256"/>
         <source>Profile height (43% - 85%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="278"/>
         <source>Other data height (8% - 17%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="338"/>
         <source>Notes height (0% - 52%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="354"/>
         <location filename="../qt-ui/printoptions.ui" line="370"/>
         <location filename="../qt-ui/printoptions.ui" line="386"/>
         <source>0</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/>
+        <source>Make first divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="906"/>
+        <source>Delete this divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="913"/>
         <source>Add Gas Change</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>LÉG</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>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
@@ -2394,24 +2591,24 @@ Please, remove them first.</source>
         <translation>Bezárás</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="34"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation>Átlag</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="37"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="40"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation>Maximum</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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2419,65 +2616,84 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/renumber.ui" line="17"/>
         <source>Renumber</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="128"/>
         <source>New starting number</source>
         <translation>Új kezdő szám</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="126"/>
+        <source>New number</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchBar</name>
+    <message>
+        <location filename="../qt-ui/searchbar.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ShiftImageTimesDialog</name>
     <message>
         <location filename="../qt-ui/shiftimagetimes.ui" line="23"/>
         <source>Shift selected times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shiftimagetimes.ui" line="34"/>
         <source>Shift times of image(s) by</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="95"/>
+        <source>h:mm</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="102"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="105"/>
         <source>earlier</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2485,43 +2701,43 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="23"/>
         <source>Shift selected times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="49"/>
         <source>Shift times of selected dives by</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="72"/>
         <source>Shifted time:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="79"/>
         <source>Current time:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="86"/>
         <location filename="../qt-ui/shifttimes.ui" line="93"/>
         <source>0:0</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="126"/>
         <source>h:mm</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="136"/>
         <source>earlier</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="143"/>
         <source>later</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2534,63 +2750,63 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/about.ui" line="80"/>
         <source>&amp;License</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.ui" line="87"/>
         <source>&amp;Website</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.ui" line="94"/>
         <source>&amp;Close</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="13"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014&lt;/span&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/>
         <source>Connecting...</source>
         <translation>Csatlakozás...</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/>
         <source>Connection Error: </source>
         <translation>Csatlakozási Hiba:</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>Érvénytelen felhasználó azonosító</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>Nem lehet feldolgozni választ!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/>
         <source>Download Success!</source>
         <translation>A Letöltés Sikeres!</translation>
     </message>
@@ -2600,102 +2816,240 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/tableview.cpp" line="23"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="37"/>
-        <source>&lt;h3&gt;Subsurface was unable to check for updates.&lt;/h3&gt;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="36"/>
+        <source>Subsurface was unable to check for updates.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
-        <source>&lt;br/&gt;&lt;b&gt;The following error occurred:&lt;/b&gt;&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="41"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="43"/>
-        <source>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Please check your internet connection.&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>UserSurvey</name>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="47"/>
+        <source>Subsurface User Survey</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="79"/>
+        <source>Recreational DIver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="92"/>
+        <source>Tech Diver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="105"/>
+        <source>Interested in dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="118"/>
+        <source>I am downloading dives from supported dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="131"/>
+        <source>I am importing dives from other software / sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="144"/>
+        <source>I am manually entering dives</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="190"/>
+        <source>Please type suggestions (in English) in the following box</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="27"/>
+        <source>
+Operating System: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="30"/>
+        <source>
+CPU Architecture: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="35"/>
+        <source>
+OS CPU Architecture %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="39"/>
+        <source>
+Language: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="73"/>
+        <source>Should we ask you later?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="74"/>
+        <source>Don&apos;t ask me again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="75"/>
+        <source>Ask Later</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="76"/>
+        <source>Ask again?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <source>Submit User Survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <source>Subsurface was unable to submit the user survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="101"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="102"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="111"/>
+        <source>Survey successfully submitted.</source>
+        <translation type="unfinished"/>
+    </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"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2703,22 +3057,22 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
         <source>Webservice Connection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="25"/>
         <source>Status:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="32"/>
         <source>Enter your ID here</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="44"/>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="68"/>
@@ -2728,237 +3082,230 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/webservices.ui" line="85"/>
         <source>Save User ID locally?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="92"/>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="106"/>
         <source>Upload</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>#</source>
         <translation>#</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="58"/>
+        <location filename="../dive.c" line="87"/>
         <source>pascal</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="1120"/>
+        <location filename="../dive.c" line="1237"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) vagy (%s)</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../equipment.c" line="170"/>
+        <location filename="../equipment.c" line="210"/>
         <source>integrated</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../equipment.c" line="171"/>
+        <location filename="../equipment.c" line="211"/>
         <source>belt</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../equipment.c" line="172"/>
+        <location filename="../equipment.c" line="212"/>
         <source>ankle</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../equipment.c" line="173"/>
+        <location filename="../equipment.c" line="213"/>
         <source>backplate weight</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../equipment.c" line="174"/>
+        <location filename="../equipment.c" line="214"/>
         <source>clip-on</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../file.c" line="106"/>
@@ -2970,812 +3317,863 @@ Maximum</source>
         <location filename="../file.c" line="406"/>
         <location filename="../file.c" line="482"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>none</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>deco stop</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>rbt</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ascent</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>workload</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>transmitter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>violation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>bookmark</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>surface</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>safety stop</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (voluntary)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (mandatory)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>deepstop</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>ceiling (safety stop)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>divetime</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>maxdepth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>OLF</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>PO2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>airtime</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>rgbm</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>heading</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>tissue level warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>non stop time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="163"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>invalid event number</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="411"/>
+        <location filename="../libdivecomputer.c" line="414"/>
         <source>Error registering the data</source>
         <translation>Hiba az adat regisztrálása alatt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="419"/>
+        <location filename="../libdivecomputer.c" line="422"/>
         <source>Error parsing the datetime</source>
         <translation>Hiba a dátumidő feldolgozása alatt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="438"/>
         <source>Dive %d: %s %d %04d</source>
         <translation>Merülés %d: %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="440"/>
+        <location filename="../libdivecomputer.c" line="443"/>
         <source>Error parsing the divetime</source>
         <translation>Hiba a merülési idő feldolgozása alatt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="449"/>
+        <location filename="../libdivecomputer.c" line="452"/>
         <source>Error parsing the maxdepth</source>
         <translation>Hiba a max mélység feldolgozása alatt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="458"/>
+        <location filename="../libdivecomputer.c" line="461"/>
         <source>Error parsing the gas mix count</source>
         <translation>Hiba gáz keverék számítás feldolgozása alatt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="470"/>
+        <location filename="../libdivecomputer.c" line="473"/>
         <source>Error obtaining water salinity</source>
         <translation>Hiba a víz sótartalmának lekérdezésekor</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error obtaining surface pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the gas mix</source>
         <translation>Hiba a gáz keverék feldolgozása alatt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="493"/>
+        <location filename="../libdivecomputer.c" line="496"/>
         <source>Error parsing the samples</source>
         <translation>Hiba a minták feldolgozása alatt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="623"/>
+        <location filename="../libdivecomputer.c" line="626"/>
         <source>Event: waiting for user action</source>
         <translation>Esemény: várakozás a felhasználóra</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="691"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the event handler.</source>
         <translation>Hiba az esemény kezelő regisztrálása alatt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="696"/>
+        <location filename="../libdivecomputer.c" line="699"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Hiba a visszavonás kezelő regisztrálása alatt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="717"/>
+        <location filename="../libdivecomputer.c" line="720"/>
         <source>Dive data import error</source>
         <translation>Merülési adat importálási hiba</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>&apos;%s&apos; értelmezése meghiúsult.</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../file.c" line="166"/>
-        <source>Database connection failed &apos;%s&apos;.
+        <source>Database connection failed '%s'.
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1887"/>
-        <location filename="../parse-xml.c" line="2034"/>
-        <source>Database query failed &apos;%s&apos;.
+        <location filename="../parse-xml.c" line="1945"/>
+        <location filename="../parse-xml.c" line="2092"/>
+        <source>Database query failed '%s'.
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="146"/>
-        <location filename="../planner.c" line="617"/>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation type="unfinished"></translation>
+        <location filename="../planner.c" line="159"/>
+        <location filename="../planner.c" line="752"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="308"/>
+        <location filename="../planner.c" line="345"/>
         <source>Too many gas mixes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="489"/>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation type="unfinished"></translation>
+        <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>NYILATKOZAT / FIGYELMEZTETÉS: EZ EGY ÚJ IMPLEMENTÁCIÓJA A BUHLMANN ALGORITMUSNAK ÉS A MERÜLÉS TERVEZŐ EZEN ALAPSZIK, AMI CSUPÁN KORLÁTOZOTT SZÁMÚ TESZTELÉSSEL RENDELKEZIK. ERŐSEN AJÁNLJUK, HOGY NE PUSZTÁN AZ ITT KAPOTT EREDMÉNYEK ALAPJÁN LEGYEN A MERÜLÉS MEGTERVEZVE.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="530"/>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../planner.c" line="535"/>
+        <source>based on GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="539"/>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../planner.c" line="538"/>
+        <source>Subsurface dive plan</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="550"/>
-        <source>Switch gas to %s
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../planner.c" line="542"/>
+        <source>depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="558"/>
-        <source>Gas consumption:
-</source>
-        <translation>Gáz felhasználás:
-</translation>
+        <location filename="../planner.c" line="545"/>
+        <source>runtime</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="569"/>
-        <source>%.0f%s of %s
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../planner.c" line="548"/>
+        <source>duration</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="810"/>
+        <location filename="../planner.c" line="551"/>
+        <source>gas</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="606"/>
+        <source>%3.0f%s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
+        <source>%3dmin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="629"/>
+        <source>Switch gas to %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="638"/>
+        <source>Gas consumption:</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="659"/>
+        <source>this is more gas than available in the specified cylinder!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="664"/>
+        <source>not enough reserve for gas sharing on ascent!</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="668"/>
+        <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="980"/>
         <source>ean</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1229"/>
+        <location filename="../profile.c" line="1253"/>
         <source>P: %d%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1233"/>
+        <location filename="../profile.c" line="1257"/>
         <source>T: %.1f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1263"/>
         <source>V: %.1f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1244"/>
+        <location filename="../profile.c" line="1268"/>
         <source>CNS: %u%%
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1246"/>
+        <location filename="../profile.c" line="1270"/>
         <source>pO%s: %.2fbar
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1272"/>
         <source>pN%s: %.2fbar
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="1274"/>
         <source>pHe: %.2fbar
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="1277"/>
         <source>MOD: %d%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1276"/>
+        <location filename="../profile.c" line="1300"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="1308"/>
         <source>Deco: %umin @ %.0f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1291"/>
+        <location filename="../profile.c" line="1315"/>
         <source>In deco
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1293"/>
+        <location filename="../profile.c" line="1317"/>
         <source>NDL: %umin
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1305"/>
+        <location filename="../profile.c" line="1329"/>
         <source>In deco (calc)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1307"/>
+        <location filename="../profile.c" line="1331"/>
         <source>NDL: %umin (calc)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1310"/>
+        <location filename="../profile.c" line="1334"/>
         <source>TTS: %umin (calc)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1313"/>
+        <location filename="../profile.c" line="1337"/>
         <source>Calculated ceiling %.0f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1319"/>
+        <location filename="../profile.c" line="1343"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1325"/>
+        <location filename="../profile.c" line="1349"/>
         <source>heartbeat: %d
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1327"/>
+        <location filename="../profile.c" line="1351"/>
         <source>bearing: %d
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1419"/>
+        <location filename="../profile.c" line="1443"/>
         <source>%sT: %d:%02d min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1435"/>
+        <location filename="../profile.c" line="1459"/>
         <source>%s %sD:%.1f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1439"/>
+        <location filename="../profile.c" line="1463"/>
         <source>%s%sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1454"/>
+        <location filename="../profile.c" line="1478"/>
         <source>%s %sP:%d %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="273"/>
+        <location filename="../qt-gui.cpp" line="281"/>
         <source>C</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>boat</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>shore</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>drift</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>deep</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>cavern</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>ice</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>wreck</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>cave</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>altitude</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>pool</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>lake</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>river</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>night</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>fresh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>student</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>photo</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>video</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>instructor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="25"/>
         <source>deco</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="216"/>
+        <location filename="../dive.c" line="133"/>
+        <source>ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="214"/>
         <source>more than %d days</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="220"/>
         <source>%dd %dh %dmin</source>
         <translation>%dn %dó %dp</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="224"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dh %dmin</source>
         <translation>%dó %dp</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="235"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="242"/>
+        <location filename="../statistics.c" line="240"/>
         <source>for selected dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="275"/>
         <source>for dive #%d</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for selected dive</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for all dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="283"/>
+        <location filename="../statistics.c" line="281"/>
         <source>(no dives)</source>
         <translation>(nincs merülés)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sun</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Mon</source>
         <translation>H</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Tue</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Wed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Thu</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Fri</source>
         <translation>P</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sat</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Mar</source>
         <translation>Már</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Apr</source>
         <translation>Ápr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>May</source>
         <translation>Máj</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jun</source>
         <translation>Jún</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Jul</source>
         <translation>Júl</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Sep</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Oct</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Nov</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Dec</source>
         <translation>Dec</translation>
     </message>
@@ -3784,165 +4182,165 @@ EADD: %d%s
         <source>Uemis Zurich: File System is almost full
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="25"/>
         <source>Uemis Zurich: File System is full
 Disconnect/reconnect the dive computer
 and try again</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="26"/>
         <source>Short write to req.txt file
 Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="107"/>
+        <location filename="../uemis-downloader.c" line="111"/>
         <source>unknown</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="399"/>
+        <location filename="../uemis-downloader.c" line="403"/>
         <source>data</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>wetsuit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>semidry</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>drysuit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>shorty</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>vest</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>long john</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>jacket</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>full suit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>2 pcs full suit</source>
         <translation>2 db teljes öltözet</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="620"/>
+        <location filename="../uemis-downloader.c" line="624"/>
         <source>membrane</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="802"/>
+        <location filename="../uemis-downloader.c" line="823"/>
         <source>Init Communication</source>
         <translation>Kommunikáció kezdése</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="815"/>
+        <location filename="../uemis-downloader.c" line="836"/>
         <source>Start download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="196"/>
         <source>Safety Stop Violation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="198"/>
         <source>Speed Alarm</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="201"/>
         <source>Speed Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="203"/>
-        <source>PO2 Green Warning</source>
-        <translation type="unfinished"></translation>
+        <source>pO₂ Green Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
-        <source>PO2 Ascend Warning</source>
-        <translation type="unfinished"></translation>
+        <source>pO₂ Ascend Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="208"/>
-        <source>PO2 Ascend Alarm</source>
-        <translation type="unfinished"></translation>
+        <source>pO₂ Ascend Alarm</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
         <source>Tank Pressure Info</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="214"/>
         <source>RGT Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="216"/>
         <source>RGT Alert</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="218"/>
         <source>Tank Change Suggested</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="220"/>
@@ -3952,7 +4350,7 @@ Is the Uemis Zurich plugged in correctly?</source>
     <message>
         <location filename="../uemis.c" line="222"/>
         <source>Max Deco Time Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="224"/>
@@ -3972,7 +4370,7 @@ Is the Uemis Zurich plugged in correctly?</source>
     <message>
         <location filename="../uemis.c" line="230"/>
         <source>No Tank Data</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="232"/>
@@ -3984,5 +4382,214 @@ Is the Uemis Zurich plugged in correctly?</source>
         <source>Low Battery Alert</source>
         <translation>Merülő Elem Riasztás</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"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="36"/>
+        <source>Date:</source>
+        <translation>Dátum:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="38"/>
+        <source>Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="40"/>
+        <source>Duration:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="41"/>
+        <source>min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="43"/>
+        <source>Max Depth:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="46"/>
+        <source>Air Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="48"/>
+        <source>Water Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="50"/>
+        <source>Location:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="54"/>
+        <source>Notes:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>plannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="35"/>
+        <source>Rates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="56"/>
+        <source>Ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="77"/>
+        <source>below 75% avg. depth</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="94"/>
+        <source>75%-50% avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="111"/>
+        <source>50% avg. depth - 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="128"/>
+        <source>6m/20ft to surface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="148"/>
+        <source>Descent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="200"/>
+        <source>surface to the bottom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="226"/>
+        <source>Planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="247"/>
+        <source>GF low</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="264"/>
+        <source>GF high</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
+        <source>Drop to first depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
+        <source>Last Stop at 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>plan backgas breaks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="318"/>
+        <source>Gas Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <source>bottom SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="349"/>
+        <source>deco SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="359"/>
+        <source>bottom pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="389"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="382"/>
+        <source>deco pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="421"/>
+        <source>Dive Notes</source>
+        <translation>Merülés Jegyzetek</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="445"/>
+        <source>display runtime</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="458"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="461"/>
+        <source>display segment duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="471"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="474"/>
+        <source>display transitions in deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="481"/>
+        <source>verbatim diveplan</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/subsurface_id.ts b/translations/subsurface_id.ts
index 8d1eadcae..557bea4e0 100644
--- a/translations/subsurface_id.ts
+++ b/translations/subsurface_id.ts
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="id" version="2.0">
+<defaultcodec>UTF-8</defaultcodec>
 <context>
     <name>CylindersModel</name>
     <message>
@@ -37,42 +38,42 @@
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="507"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="508"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="527"/>
+        <location filename="../qt-ui/models.cpp" line="532"/>
         <source>l</source>
         <translation>I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="528"/>
+        <location filename="../qt-ui/models.cpp" line="533"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -99,22 +100,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>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Device ID</source>
         <translation>ID Perangkat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Nickname</source>
         <translation>Nama Panggilan</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"/>
     </message>
@@ -122,190 +123,326 @@
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="90"/>
-        <source>air</source>
-        <translation>udara</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="92"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</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>Bailing out untuk OC</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>Mulai</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>Akhir</translation>
     </message>
 </context>
 <context>
-    <name>DiveGasPressureItem</name>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="475"/>
-        <source>air</source>
-        <translation>udara</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="476"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-</context>
-<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1258"/>
-        <source> l/min</source>
-        <translation>I/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
-        <source> cuft/min</source>
-        <translation>cuft/min</translation>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <source>/min</source>
+        <translation>/menit</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>Munculkan Kotak Pencari</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="706"/>
         <source>expand all</source>
         <translation>Tampilkan semua</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="740"/>
+        <location filename="../qt-ui/divelistview.cpp" line="707"/>
         <source>collapse all</source>
         <translation>Sembunyikan semua</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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <source>shift times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="763"/>
-        <source>export As UDDF</source>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <source>load images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="764"/>
-        <source>export As CSV</source>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Open Image Files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="765"/>
-        <source>shift times</source>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="766"/>
-        <source>load images</source>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <source>merge selected dives</source>
+        <translation>Gabungkan selam berikut</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"/>
     </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="24"/>
+        <source>General Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="30"/>
+        <source>Export format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="42"/>
+        <source>Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="61"/>
+        <source>UDDF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="74"/>
+        <source>divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="84"/>
+        <source>CSV</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="94"/>
+        <source>Worldmap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="107"/>
+        <source>Selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="116"/>
+        <source>Selected dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="126"/>
+        <source>All dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="178"/>
+        <source>HTML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="184"/>
+        <source>General Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="190"/>
+        <source>Subsurface Numbers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="203"/>
+        <source>Selected Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="216"/>
+        <source>Minimum Javascript</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="229"/>
+        <source>All Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="239"/>
+        <source>Export List only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="252"/>
+        <source>Style Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="264"/>
+        <source>Font</source>
+        <translation>Huruf</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="274"/>
+        <source>Font size</source>
+        <translation>Ukuran Huruf</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
+        <source>8</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="795"/>
-        <source>Save Dives As...</source>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <source>10</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="814"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <source>12</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <source>14</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <source>16</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <source>18</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <source>20</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="323"/>
+        <source>Theme</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <source>Sand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="153"/>
         <source>Export UDDF File as</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="760"/>
-        <source>merge selected dives</source>
-        <translation>Gabungkan selam berikut</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="167"/>
+        <source>Export Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="168"/>
+        <source>XML files (*.xml *.ssrf)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="176"/>
+        <source>Export HTML files as</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -316,138 +453,133 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="36"/>
-        <source>Import CSV Dive Log Files</source>
-        <translation type="unfinished"/>
-    </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="80"/>
         <source>Depth</source>
         <translation>edalaman</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="107"/>
         <source>PO2</source>
         <translation>PO2</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="121"/>
         <source>Temp</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="151"/>
         <source>Cns</source>
         <translation type="unfinished"/>
     </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>Satuan</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>Metrik</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>Imperial</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="283"/>
         <source>Dive #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="317"/>
         <source>Date</source>
         <translation>Tanggal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="385"/>
         <source>Duration</source>
         <translation>Durasi</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
         <source>Location</source>
         <translation>Lokasi</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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="368"/>
         <source>Buddy</source>
         <translation>Rekan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="402"/>
         <source>Notes</source>
         <translation>Catatan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="436"/>
         <source>Weight</source>
         <translation>Berat</translation>
     </message>
@@ -455,104 +587,70 @@
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="71"/>
-        <source>Bottom SAC</source>
-        <translation>SAC  bawah</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="85"/>
-        <source>SAC on DECO Stop</source>
-        <translation>SAC pada pemberhentian DECO</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="78"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="98"/>
-        <source>GFLow</source>
-        <translation>GFlow</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="125"/>
-        <source>Last Stop at 6m</source>
-        <translation>Pemberhentian terakhir pada 6m</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="106"/>
+        <source>Planned Dive Time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="174"/>
-        <source>Start Time</source>
-        <translation>Waktu mulai</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="134"/>
+        <source>Altitude</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="181"/>
+        <location filename="../qt-ui/diveplanner.ui" line="141"/>
         <source>ATM Pressure</source>
         <translation>Tekanan ATM</translation>
     </message>
-</context>
-<context>
-    <name>DivePlannerGraphics</name>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="114"/>
-        <source>10m</source>
-        <translation>10m</translation>
-    </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="116"/>
-        <source>30ft</source>
-        <translation>30ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="363"/>
-        <source>Handler Position Error</source>
-        <translation>Kesalahan posisi Handler</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="148"/>
+        <source>mbar</source>
+        <translation type="unfinished"/>
     </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>
-        <translation>Satu atau lebih dari Pemberhentianmu akan hilang melalui pengoperasian ini, Coba, lepas terlebih dahulu</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="158"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="445"/>
-        <source>AIR</source>
-        <translation>UDARA</translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="137"/>
+        <source>unknown</source>
+        <translation>Tak dikenal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1148"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="586"/>
         <source>Final Depth</source>
         <translation>Kedalaman akhir</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1152"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="590"/>
         <source>Duration</source>
         <translation>Durasi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1154"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="592"/>
         <source>Used Gas</source>
         <translation>Gas terpaikai</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>Titik CC</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>Abaikan Rencana</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>Kamu hendak mengabaikan Rencana</translation>
     </message>
@@ -560,17 +658,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>Titik-titik Rencana Selam</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"/>
     </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"/>
     </message>
@@ -614,104 +712,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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
-        <source>Ceiling</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>pHe</source>
+        <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>pO₂</source>
+        <translation type="unfinished"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
-        <source>PO2</source>
-        <translation>PO2</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <source>SAC</source>
+        <translation>SAC</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>#</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1298"/>
         <source>min</source>
         <translation>menit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>lbs</source>
         <translation>lbs</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1310"/>
         <source>cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1344"/>
+        <location filename="../qt-ui/models.cpp" line="1325"/>
         <source>location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1316"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1338"/>
+        <location filename="../qt-ui/models.cpp" line="1319"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1341"/>
+        <location filename="../qt-ui/models.cpp" line="1322"/>
         <source>maxCNS</source>
         <translation>maxCNS</translation>
     </message>
@@ -719,114 +817,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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -834,54 +932,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>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="165"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/>
         <source>Error</source>
         <translation>Kesalahan</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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="339"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -949,7 +1047,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"/>
     </message>
@@ -958,848 +1056,854 @@ 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>Catatan Selam</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>Lokasi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="148"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Coordinates</source>
         <translation>Koordinat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="169"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="155"/>
+        <location filename="../qt-ui/maintab.ui" line="148"/>
         <source>Buddy</source>
         <translation>Rekan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="63"/>
-        <source>Start time</source>
-        <translation type="unfinished"/>
-    </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="127"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="223"/>
         <source>Rating</source>
         <translation>Peringkat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="236"/>
         <source>Visibility</source>
         <translation>Jarak Lihat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="215"/>
+        <location filename="../qt-ui/maintab.ui" line="127"/>
         <source>Suit</source>
         <translation>Pakaian</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>Catatan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="270"/>
+        <location filename="../qt-ui/maintab.ui" line="311"/>
         <source>Equipment</source>
         <translation>Perlengkapan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="350"/>
+        <location filename="../qt-ui/maintab.ui" line="391"/>
         <source>Dive Info</source>
         <translation>Info Selam</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>Tanggal</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="455"/>
         <source>Interval</source>
         <translation>Rentang  Waktu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="433"/>
+        <location filename="../qt-ui/maintab.ui" line="474"/>
         <source>Gases Used</source>
         <translation>Seluruh Gas yang terpakai</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="452"/>
+        <location filename="../qt-ui/maintab.ui" line="493"/>
         <source>Gas Consumed</source>
         <translation>Gas Terpakai</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>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="531"/>
         <source>Max. Depth</source>
         <translation>Kedalaman Maks</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="509"/>
+        <location filename="../qt-ui/maintab.ui" line="550"/>
         <source>Ave. Depth</source>
         <translation>Kedalaman Rata-rata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="528"/>
+        <location filename="../qt-ui/maintab.ui" line="569"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="547"/>
+        <location filename="../qt-ui/maintab.ui" line="588"/>
         <source>Air Pressure</source>
         <translation>Tekanan Udara</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="566"/>
+        <location filename="../qt-ui/maintab.ui" line="607"/>
         <source>Air Temperature</source>
         <translation>Suhu Udara</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="585"/>
+        <location filename="../qt-ui/maintab.ui" line="626"/>
         <source>Water Temperature</source>
         <translation>Suhu Air</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="604"/>
+        <location filename="../qt-ui/maintab.ui" line="645"/>
         <source>Dive Time</source>
         <translation>Waktu Selam</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="623"/>
+        <location filename="../qt-ui/maintab.ui" line="664"/>
         <source>Salinity</source>
         <translation>Kadar Garam</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="660"/>
+        <location filename="../qt-ui/maintab.ui" line="701"/>
         <source>Stats</source>
         <translation>Statisktik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="746"/>
         <source>Depth</source>
         <translation>Kedalaman</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Temperature</source>
         <translation>Suhu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="784"/>
         <source>Duration</source>
         <translation>Rentang Waktu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Total Time</source>
         <translation>Waktu Keseluruhan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="835"/>
         <source>Dives</source>
         <translation>Selam</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="919"/>
+        <source>Photos</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="89"/>
         <source>Cylinders</source>
         <translation>Tabung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="90"/>
         <source>Add Cylinder</source>
         <translation>Tambah Tabung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="93"/>
         <source>Weights</source>
         <translation>Berat</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>Tambah Sistem Berat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="438"/>
+        <location filename="../qt-ui/maintab.cpp" line="409"/>
         <source>Trip Location</source>
         <translation>Lokasi Perjalanan</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>Catatan Perjalanan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="42"/>
+        <location filename="../qt-ui/maintab.cpp" line="48"/>
         <source>Save</source>
         <translation>Simpan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="46"/>
+        <location filename="../qt-ui/maintab.cpp" line="52"/>
         <source>Cancel</source>
         <translation>Batal</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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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>/menit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="494"/>
+        <location filename="../qt-ui/maintab.cpp" line="464"/>
         <source>unknown</source>
         <translation>Tak dikenal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>N</source>
-        <translation>U</translation>
+        <location filename="../qt-ui/maintab.cpp" line="501"/>
+        <source>Deepest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>S</source>
-        <translation>S</translation>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <source>Shallowest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>E</source>
-        <translation>T</translation>
+        <location filename="../qt-ui/maintab.cpp" line="794"/>
+        <source>Discard the Changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>W</source>
-        <translation>B</translation>
+        <location filename="../qt-ui/maintab.cpp" line="795"/>
+        <source>You are about to discard your changes.</source>
+        <translation type="unfinished"/>
     </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>Saring</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"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="583"/>
+        <source>Print</source>
+        <translation type="unfinished"/>
+    </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:'Courier'; 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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
         <source>&amp;Log</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="655"/>
+        <location filename="../qt-ui/mainwindow.ui" line="728"/>
         <source>New</source>
         <translation>Baru</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="658"/>
+        <location filename="../qt-ui/mainwindow.ui" line="731"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="666"/>
+        <location filename="../qt-ui/mainwindow.ui" line="739"/>
         <source>Open</source>
         <translation>Buka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <location filename="../qt-ui/mainwindow.ui" line="742"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="677"/>
+        <location filename="../qt-ui/mainwindow.ui" line="750"/>
         <source>Save</source>
         <translation>Simpan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="680"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>Save as</source>
         <translation>Simpan sebagai</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>Ctrl+Shift+S</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Close</source>
         <translation>Tutup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="702"/>
+        <location filename="../qt-ui/mainwindow.ui" line="775"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="902"/>
-        <source>Ctrl+I</source>
-        <translation>Ctrl+I</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <source>P&amp;references</source>
+        <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="723"/>
-        <source>&amp;Print</source>
-        <translation>&amp;Print</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="937"/>
+        <source>&amp;Globe</source>
+        <translation type="unfinished"/>
     </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"/>
     </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>Ctrl+I</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1008"/>
+        <source>&amp;Export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="753"/>
-        <source>Import from &amp;dive computer</source>
+        <location filename="../qt-ui/mainwindow.ui" line="1011"/>
+        <source>Export Dive Logs</source>
         <translation type="unfinished"/>
     </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="1014"/>
+        <source>Ctrl+E</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="764"/>
-        <source>Ctrl+G</source>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
+        <source>Enable the pN2 Graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
-        <source>&amp;Edit Device Names</source>
+        <location filename="../qt-ui/mainwindow.ui" line="128"/>
+        <source>Enable the pHe graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
-        <source>Ctrl++</source>
+        <location filename="../qt-ui/mainwindow.ui" line="290"/>
+        <source>Show/hide heart rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="782"/>
-        <source>&amp;Renumber</source>
+        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <source>Enable EAD, END, and EADD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="785"/>
-        <source>Ctrl+R</source>
+        <location filename="../qt-ui/mainwindow.ui" line="238"/>
+        <source>Show NDL / TTS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="798"/>
-        <source>&amp;Yearly Statistics</source>
+        <location filename="../qt-ui/mainwindow.ui" line="394"/>
+        <source>Rescale depth axis</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="801"/>
-        <source>Ctrl+Y</source>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <source>&amp;Print</source>
+        <translation>&amp;Print</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="791"/>
+        <source>Ctrl+,</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="806"/>
-        <source>Dive List</source>
+        <location filename="../qt-ui/mainwindow.ui" line="799"/>
+        <source>&amp;Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="814"/>
-        <source>Profile</source>
+        <location filename="../qt-ui/mainwindow.ui" line="810"/>
+        <source>Import from &amp;dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="822"/>
-        <source>Info</source>
+        <location filename="../qt-ui/mainwindow.ui" line="818"/>
+        <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="830"/>
-        <source>All</source>
+        <location filename="../qt-ui/mainwindow.ui" line="821"/>
+        <source>Ctrl+G</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="872"/>
-        <source>User &amp;Manual</source>
+        <location filename="../qt-ui/mainwindow.ui" line="826"/>
+        <source>&amp;Edit Device Names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="880"/>
-        <source>Globe</source>
+        <location filename="../qt-ui/mainwindow.ui" line="834"/>
+        <source>Ctrl++</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="888"/>
-        <source>P&amp;lan Dive</source>
+        <location filename="../qt-ui/mainwindow.ui" line="839"/>
+        <source>&amp;Renumber</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="891"/>
-        <source>Ctrl+L</source>
+        <location filename="../qt-ui/mainwindow.ui" line="842"/>
+        <source>Ctrl+R</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="907"/>
-        <source>Import from Divelogs.de</source>
+        <location filename="../qt-ui/mainwindow.ui" line="855"/>
+        <source>&amp;Yearly Statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
-        <source>&amp;Check for Updates</source>
+        <location filename="../qt-ui/mainwindow.ui" line="858"/>
+        <source>Ctrl+Y</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="929"/>
+        <source>User &amp;Manual</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="945"/>
+        <source>P&amp;lan Dive</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="783"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</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"/>
     </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>...</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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="731"/>
-        <source>Preferences</source>
-        <translation>Preferensi</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="745"/>
+        <location filename="../qt-ui/mainwindow.ui" line="802"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="756"/>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="774"/>
-        <source>Add Dive</source>
-        <translation>Tambah Selam</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="793"/>
-        <source>Auto Group</source>
-        <translation>Grup Otomatis</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="809"/>
+        <location filename="../qt-ui/mainwindow.ui" line="866"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="817"/>
+        <location filename="../qt-ui/mainwindow.ui" line="874"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <location filename="../qt-ui/mainwindow.ui" line="882"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="833"/>
+        <location filename="../qt-ui/mainwindow.ui" line="890"/>
         <source>Ctrl+1</source>
         <translation>Cltrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="838"/>
-        <source>Prev DC</source>
-        <translation>DC Sebelumnya</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="841"/>
+        <location filename="../qt-ui/mainwindow.ui" line="898"/>
         <source>Left</source>
         <translation>Kiri</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="846"/>
-        <source>Next DC</source>
-        <translation>DC Selanjunya</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="849"/>
+        <location filename="../qt-ui/mainwindow.ui" line="906"/>
         <source>Right</source>
         <translation>Kanan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="854"/>
-        <source>Select Events</source>
-        <translation>Pilih Aktifitas</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <location filename="../qt-ui/mainwindow.ui" line="916"/>
         <source>Input Plan</source>
         <translation>Masukkan Rencana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="864"/>
-        <source>About Subsurface</source>
-        <translation>Tentang Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="875"/>
+        <location filename="../qt-ui/mainwindow.ui" line="932"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="883"/>
+        <location filename="../qt-ui/mainwindow.ui" line="940"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <location filename="../qt-ui/mainwindow.ui" line="978"/>
         <source>F11</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="174"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
         <source>Open File</source>
         <translation>Buka Berkas</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"/>
     </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"/>
     </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"/>
     </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>Anda ingin menyimpan perubahan yang sudah dilakukan pada Berkas %1</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>Anda ingin menyimpan perubahan yang sudah dilakukan pada datafile?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="652"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="717"/>
         <source>Save Changes?</source>
         <translation>Simpan perubahan?</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>Perubahan akan hilang jika anda tidak simpan.</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>Simpan Berkas sebagai</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="280"/>
-        <source>Export UDDF File as</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="281"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="289"/>
-        <source>Export CSV File as</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="290"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="299"/>
-        <source>Export World Map</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="300"/>
-        <source>HTML files (*.html)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="449"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="514"/>
         <source>Yearly Statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="961"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1076"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1199"/>
         <source>Open Dive Log File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1225"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>PlannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Last stop at 20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="416"/>
+        <source>Last stop at 6m</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>PreferencesDialog</name>
     <message>
         <location filename="../qt-ui/preferences.ui" line="85"/>
@@ -1822,247 +1926,297 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="141"/>
+        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <source>Network</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="151"/>
         <source>Lists and Tables</source>
         <translation>Tabel dan daftar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font</source>
         <translation>Huruf</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="167"/>
         <source>Font size</source>
         <translation>Ukuran Huruf</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="170"/>
+        <location filename="../qt-ui/preferences.ui" line="180"/>
         <source>Dives</source>
         <translation>Selam</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>Berkas Dive Acuan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="188"/>
+        <location filename="../qt-ui/preferences.ui" line="198"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="197"/>
+        <location filename="../qt-ui/preferences.ui" line="207"/>
         <source>Display Invalid</source>
         <translation>Cacat Layar</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <location filename="../qt-ui/preferences.ui" line="247"/>
         <source>Animations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <location filename="../qt-ui/preferences.ui" line="253"/>
         <source>Speed</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="312"/>
+        <source>Reset all settings to their default value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
         <source>System</source>
         <translation>Sistem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="348"/>
         <source>Metric</source>
         <translation>Metrik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="333"/>
+        <location filename="../qt-ui/preferences.ui" line="358"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="343"/>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
         <source>Personalize</source>
         <translation>Personalisasi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="392"/>
         <source>Depth</source>
         <translation>edalaman</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="409"/>
         <source>feet</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="401"/>
+        <location filename="../qt-ui/preferences.ui" line="426"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="411"/>
+        <location filename="../qt-ui/preferences.ui" line="436"/>
         <source>psi</source>
         <translation>psi</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="455"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>celsius</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="465"/>
+        <location filename="../qt-ui/preferences.ui" line="490"/>
         <source>fahrenheit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="482"/>
+        <location filename="../qt-ui/preferences.ui" line="507"/>
         <source>kg</source>
         <translation>kgkg</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"/>
     </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"/>
     </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"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="817"/>
+        <source>Proxy type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="830"/>
+        <source>Host</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="856"/>
+        <source>Port</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="882"/>
+        <source>Requires authentication</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="657"/>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="925"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="682"/>
         <source>draw dive computer reported ceiling red</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="767"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>Filter</source>
         <translation>Saring</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="419"/>
         <source>Pressure</source>
         <translation>Tekanan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="421"/>
+        <location filename="../qt-ui/preferences.ui" line="446"/>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="448"/>
+        <location filename="../qt-ui/preferences.ui" line="473"/>
         <source>Temperature</source>
         <translation>Suhu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="475"/>
+        <location filename="../qt-ui/preferences.ui" line="500"/>
         <source>Weight</source>
         <translation>Berat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="517"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="507"/>
+        <location filename="../qt-ui/preferences.ui" line="532"/>
         <source>Time units</source>
         <translation>Satuan Waktu</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>penyebut kecepatan naik/turun</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="520"/>
+        <location filename="../qt-ui/preferences.ui" line="545"/>
         <source>Minutes</source>
         <translation>Menit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="530"/>
+        <location filename="../qt-ui/preferences.ui" line="555"/>
         <source>Seconds</source>
         <translation>Detik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="562"/>
+        <location filename="../qt-ui/preferences.ui" line="587"/>
         <source>Show</source>
         <translation>Tampilkan</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="693"/>
         <source>Show non-used cylinders in Equipment Tab</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="691"/>
+        <location filename="../qt-ui/preferences.ui" line="716"/>
         <source>Misc</source>
         <translation>Lain-lain</translation>
     </message>
@@ -2072,35 +2226,65 @@ Please, remove them first.</source>
         <translation>Preferensi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="697"/>
+        <location filename="../qt-ui/preferences.ui" line="722"/>
         <source>GFLow</source>
         <translation>GFlow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="739"/>
         <source>GFHigh</source>
         <translation>GFHigh</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="24"/>
+        <source>System proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="25"/>
+        <source>HTTP proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="26"/>
+        <source>SOCKS proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="245"/>
         <source>Restart required</source>
         <translation type="unfinished"/>
     </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"/>
     </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>Buka Berkas Log Acuan</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>Subsurface XML files (*.ssrf *.xml *.XML)</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="394"/>
+        <source>Warning</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
 </context>
 <context>
     <name>PrintDialog</name>
@@ -2241,72 +2425,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>Tak dikenal</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>Selam #%1 - %2</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>Kedalaman Maks: 1% 2%</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>Durasi: %1 menit</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1920"/>
+        <location filename="../qt-ui/models.cpp" line="1900"/>
         <source>SAC:</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1924"/>
+        <location filename="../qt-ui/models.cpp" line="1904"/>
         <source>Weights:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1929"/>
+        <location filename="../qt-ui/models.cpp" line="1909"/>
         <source>Notes:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1936"/>
+        <location filename="../qt-ui/models.cpp" line="1916"/>
         <source>Divemaster:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1938"/>
+        <location filename="../qt-ui/models.cpp" line="1918"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1940"/>
+        <location filename="../qt-ui/models.cpp" line="1920"/>
         <source>Suit:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1942"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>Viz:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1944"/>
+        <location filename="../qt-ui/models.cpp" line="1924"/>
         <source>Rating:</source>
         <translation type="unfinished"/>
     </message>
@@ -2314,62 +2498,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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/>
+        <source>Make first divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="906"/>
+        <source>Delete this divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="913"/>
         <source>Add Gas Change</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -2377,12 +2576,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>UDARA</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"/>
     </message>
@@ -2392,22 +2591,22 @@ Please, remove them first.</source>
         <translation>Tutup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="34"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation>Rata-rata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="37"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation>Minimal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="40"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation>Maksimal</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"/>
     </message>
@@ -2421,9 +2620,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>Nomor Awal baru</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="126"/>
+        <source>New number</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchBar</name>
+    <message>
+        <location filename="../qt-ui/searchbar.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ShiftImageTimesDialog</name>
@@ -2438,42 +2651,47 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="105"/>
         <source>earlier</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="109"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="112"/>
         <source>later</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -2553,42 +2771,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>Webservice</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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/>
         <source>Connection Error: </source>
         <translation>Kesalahan Koneksi:</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>identifikasi pengguna tidak cocok!</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>Respon gagal di telaah!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/>
         <source>Download Success!</source>
         <translation>Unduh Sukses!</translation>
     </message>
@@ -2604,17 +2822,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>Penjelasan</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2622,7 +2840,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>Informasi</translation>
     </message>
@@ -2630,42 +2848,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"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="37"/>
-        <source>&lt;h3&gt;Subsurface was unable to check for updates.&lt;/h3&gt;</source>
+        <location filename="../qt-ui/updatemanager.cpp" line="36"/>
+        <source>Subsurface was unable to check for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
-        <source>&lt;br/&gt;&lt;b&gt;The following error occurred:&lt;/b&gt;&lt;br/&gt;</source>
+        <location filename="../qt-ui/updatemanager.cpp" line="41"/>
+        <source>The following error occurred:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="43"/>
-        <source>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Please check your internet connection.&lt;/b&gt;</source>
+        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
+        <source>Please check your internet connection.</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -2673,25 +2891,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"/>
     </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>Panduan Subsurface tak dapat ditemukan</translation>
     </message>
 </context>
 <context>
+    <name>UserSurvey</name>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="47"/>
+        <source>Subsurface User Survey</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="79"/>
+        <source>Recreational DIver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="92"/>
+        <source>Tech Diver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="105"/>
+        <source>Interested in dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="118"/>
+        <source>I am downloading dives from supported dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="131"/>
+        <source>I am importing dives from other software / sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="144"/>
+        <source>I am manually entering dives</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="190"/>
+        <source>Please type suggestions (in English) in the following box</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="27"/>
+        <source>
+Operating System: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="30"/>
+        <source>
+CPU Architecture: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="35"/>
+        <source>
+OS CPU Architecture %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="39"/>
+        <source>
+Language: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="73"/>
+        <source>Should we ask you later?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="74"/>
+        <source>Don&apos;t ask me again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="75"/>
+        <source>Ask Later</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="76"/>
+        <source>Ask again?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <source>Submit User Survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <source>Subsurface was unable to submit the user survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="101"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="102"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="111"/>
+        <source>Survey successfully submitted.</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </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>Penjelasan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="723"/>
+        <location filename="../qt-ui/models.cpp" line="721"/>
         <source>kg</source>
         <translation>kgkg</translation>
     </message>
@@ -2739,12 +3095,12 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </message>
@@ -2752,37 +3108,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>Tipe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="368"/>
+        <location filename="../qt-ui/models.cpp" line="373"/>
         <source>Weight</source>
         <translation>Berat</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="453"/>
+        <location filename="../qt-ui/models.cpp" line="458"/>
         <source>kg</source>
         <translation>kgkg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="454"/>
+        <location filename="../qt-ui/models.cpp" line="459"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="478"/>
+        <location filename="../qt-ui/models.cpp" line="483"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="484"/>
         <source>m</source>
         <translation>m</translation>
     </message>
@@ -2790,77 +3146,77 @@ 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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1643"/>
         <source>Duration 
  Total</source>
         <translation>Total Durasi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>
 Average</source>
         <translation>
 Rata-rata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>
 Shortest</source>
         <translation>
 Terpendek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>
 Longest</source>
         <translation>
 Terjauh</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>Dalam (%1)
 Rata-rata</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>
 Minimal</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>
 Maksimal</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>SAC (%1)
 Rata-rata</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>Temp. (%1)
@@ -2870,99 +3226,92 @@ Rata-rata</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="58"/>
+        <location filename="../dive.c" line="87"/>
         <source>pascal</source>
         <translation>Pascal</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>bar</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>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="104"/>
-        <location filename="../qt-gui.cpp" line="292"/>
-        <source>l</source>
-        <translation>I</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>cuft</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>m</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>ft</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>lbs</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>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1120"/>
+        <location filename="../dive.c" line="1237"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) or (%s)</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>udara</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="170"/>
+        <location filename="../equipment.c" line="210"/>
         <source>integrated</source>
         <translation>terintegrasi</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="171"/>
+        <location filename="../equipment.c" line="211"/>
         <source>belt</source>
         <translation>sabuk</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="172"/>
+        <location filename="../equipment.c" line="212"/>
         <source>ankle</source>
         <translation>Pergelangan kaki</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="173"/>
+        <location filename="../equipment.c" line="213"/>
         <source>backplate weight</source>
         <translation>berat plat-punggung</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="174"/>
+        <location filename="../equipment.c" line="214"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -2979,251 +3328,251 @@ Rata-rata</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>none</source>
         <translation>kosong</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>deco stop</source>
         <translation>pemberhentian deco</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ascent</source>
         <translation>nai</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ceiling</source>
         <translation>batas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>workload</source>
         <translation>beban kerja</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>transmitter</source>
         <translation>pemancar</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>violation</source>
         <translation>gangguan</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>bookmark</source>
         <translation>tandai</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>surface</source>
         <translation>permuakaan</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>safety stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
         <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>gaschange</source>
         <translation>ganti gas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (voluntary)</source>
         <translation>safety stop (bebas)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (mandatory)</source>
         <translation>safety stop (wajib)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>deepstop</source>
         <translation>deepstop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>ceiling (safety stop)</source>
         <translation>batas (safety stop)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>divetime</source>
         <translation>waktu selam</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"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>maxdepth</source>
         <translation>dalam maks</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>airtime</source>
         <translation>waktu mengudara</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>heading</source>
         <translation>judul</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>tissue level warning</source>
         <translation>peringatan tingkat jaringan</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>non stop time</source>
         <translation>waktu non stop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="163"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>invalid event number</source>
         <translation>nomor kejadian tidak sesuai</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>tidak dapat membuat pengurai untuk %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="411"/>
+        <location filename="../libdivecomputer.c" line="414"/>
         <source>Error registering the data</source>
         <translation>Gagal mendaftarkan data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="419"/>
+        <location filename="../libdivecomputer.c" line="422"/>
         <source>Error parsing the datetime</source>
         <translation>Gagal mengurai tanggal</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="438"/>
         <source>Dive %d: %s %d %04d</source>
         <translation>Selam %d: %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="440"/>
+        <location filename="../libdivecomputer.c" line="443"/>
         <source>Error parsing the divetime</source>
         <translation>Gagal mengurai waktu selam</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="449"/>
+        <location filename="../libdivecomputer.c" line="452"/>
         <source>Error parsing the maxdepth</source>
         <translation>Gagal mengurai kedalamn maks</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="458"/>
+        <location filename="../libdivecomputer.c" line="461"/>
         <source>Error parsing the gas mix count</source>
         <translation>Gagal mengurai perhitungan campuran gas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="470"/>
+        <location filename="../libdivecomputer.c" line="473"/>
         <source>Error obtaining water salinity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the gas mix</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="493"/>
+        <location filename="../libdivecomputer.c" line="496"/>
         <source>Error parsing the samples</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="623"/>
+        <location filename="../libdivecomputer.c" line="626"/>
         <source>Event: waiting for user action</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="691"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the event handler.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="696"/>
+        <location filename="../libdivecomputer.c" line="699"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="717"/>
+        <location filename="../libdivecomputer.c" line="720"/>
         <source>Dive data import error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="756"/>
+        <location filename="../libdivecomputer.c" line="759"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
@@ -3235,552 +3584,604 @@ Rata-rata</translation>
         <translation type="unfinished"/>
     </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 '%s'.
 </source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../planner.c" line="308"/>
+        <location filename="../planner.c" line="345"/>
         <source>Too many gas mixes</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../planner.c" line="558"/>
-        <source>Gas consumption:
-</source>
+        <location filename="../planner.c" line="545"/>
+        <source>runtime</source>
         <translation type="unfinished"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="551"/>
+        <source>gas</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="606"/>
+        <source>%3.0f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="810"/>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
+        <source>%3dmin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="629"/>
+        <source>Switch gas to %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="638"/>
+        <source>Gas consumption:</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="659"/>
+        <source>this is more gas than available in the specified cylinder!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="664"/>
+        <source>not enough reserve for gas sharing on ascent!</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="668"/>
+        <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="980"/>
         <source>ean</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1226"/>
+        <location filename="../profile.c" line="1250"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1229"/>
+        <location filename="../profile.c" line="1253"/>
         <source>P: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1233"/>
+        <location filename="../profile.c" line="1257"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1263"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1244"/>
+        <location filename="../profile.c" line="1268"/>
         <source>CNS: %u%%
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1246"/>
+        <location filename="../profile.c" line="1270"/>
         <source>pO%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1272"/>
         <source>pN%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="1274"/>
         <source>pHe: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="1277"/>
         <source>MOD: %d%s
 </source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1276"/>
+        <location filename="../profile.c" line="1300"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1279"/>
+        <location filename="../profile.c" line="1303"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="1308"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
+        <location filename="../profile.c" line="1311"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1291"/>
+        <location filename="../profile.c" line="1315"/>
         <source>In deco
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1293"/>
+        <location filename="../profile.c" line="1317"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1297"/>
+        <location filename="../profile.c" line="1321"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1305"/>
+        <location filename="../profile.c" line="1329"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1307"/>
+        <location filename="../profile.c" line="1331"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1310"/>
+        <location filename="../profile.c" line="1334"/>
         <source>TTS: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1313"/>
+        <location filename="../profile.c" line="1337"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1319"/>
+        <location filename="../profile.c" line="1343"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1325"/>
+        <location filename="../profile.c" line="1349"/>
         <source>heartbeat: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1327"/>
+        <location filename="../profile.c" line="1351"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1419"/>
+        <location filename="../profile.c" line="1443"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1435"/>
+        <location filename="../profile.c" line="1459"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1439"/>
+        <location filename="../profile.c" line="1463"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1454"/>
+        <location filename="../profile.c" line="1478"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="273"/>
+        <location filename="../qt-gui.cpp" line="281"/>
         <source>C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="276"/>
+        <location filename="../qt-gui.cpp" line="284"/>
         <source>F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="392"/>
-        <source>%1, %2 %3, %4 %5:%6</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="405"/>
-        <source>%1 %2, %3
-%4:%5</source>
-        <translation type="unfinished"/>
-    </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>boat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>shore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>drift</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>deep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>cavern</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>ice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>wreck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>cave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>altitude</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>pool</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>lake</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>river</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>night</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>fresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>student</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>instructor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="25"/>
         <source>deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="216"/>
+        <location filename="../dive.c" line="133"/>
+        <source>ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="214"/>
         <source>more than %d days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="220"/>
         <source>%dd %dh %dmin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="224"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dh %dmin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="235"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="242"/>
+        <location filename="../statistics.c" line="240"/>
         <source>for selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="275"/>
         <source>for dive #%d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for selected dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for all dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="283"/>
+        <location filename="../statistics.c" line="281"/>
         <source>(no dives)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sun</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Mon</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Tue</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Wed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Thu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Fri</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Feb</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Mar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Apr</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>May</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jun</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Jul</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Aug</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Sep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Oct</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Nov</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Dec</source>
         <translation type="unfinished"/>
     </message>
@@ -3805,97 +4206,97 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="107"/>
+        <location filename="../uemis-downloader.c" line="111"/>
         <source>unknown</source>
         <translation>Tak dikenal</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"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="399"/>
+        <location filename="../uemis-downloader.c" line="403"/>
         <source>data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="420"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>divelog entry id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="422"/>
+        <location filename="../uemis-downloader.c" line="426"/>
         <source>divespot data id</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>wetsuit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>semidry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>drysuit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>shorty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>vest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>long john</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>jacket</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>full suit</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="620"/>
+        <location filename="../uemis-downloader.c" line="624"/>
         <source>membrane</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="802"/>
+        <location filename="../uemis-downloader.c" line="823"/>
         <source>Init Communication</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="804"/>
+        <location filename="../uemis-downloader.c" line="825"/>
         <source>Uemis init failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="815"/>
+        <location filename="../uemis-downloader.c" line="836"/>
         <source>Start download</source>
         <translation type="unfinished"/>
     </message>
@@ -3916,17 +4317,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"/>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
-        <source>PO2 Ascend Warning</source>
+        <source>pO₂ Ascend Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="208"/>
-        <source>PO2 Ascend Alarm</source>
+        <source>pO₂ Ascend Alarm</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -3989,5 +4390,214 @@ Is the Uemis Zurich plugged in correctly?</source>
         <source>Low Battery Alert</source>
         <translation type="unfinished"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="36"/>
+        <source>Date:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="38"/>
+        <source>Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="40"/>
+        <source>Duration:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="41"/>
+        <source>min</source>
+        <translation>menit</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="43"/>
+        <source>Max Depth:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="46"/>
+        <source>Air Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="48"/>
+        <source>Water Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="50"/>
+        <source>Location:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="54"/>
+        <source>Notes:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>plannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="35"/>
+        <source>Rates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="56"/>
+        <source>Ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="77"/>
+        <source>below 75% avg. depth</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="94"/>
+        <source>75%-50% avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="111"/>
+        <source>50% avg. depth - 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="128"/>
+        <source>6m/20ft to surface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="148"/>
+        <source>Descent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="200"/>
+        <source>surface to the bottom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="226"/>
+        <source>Planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="247"/>
+        <source>GF low</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="264"/>
+        <source>GF high</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
+        <source>Drop to first depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
+        <source>Last Stop at 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>plan backgas breaks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="318"/>
+        <source>Gas Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <source>bottom SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="349"/>
+        <source>deco SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="359"/>
+        <source>bottom pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="389"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="382"/>
+        <source>deco pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="421"/>
+        <source>Dive Notes</source>
+        <translation>Catatan Selam</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="445"/>
+        <source>display runtime</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="458"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="461"/>
+        <source>display segment duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="471"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="474"/>
+        <source>display transitions in deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="481"/>
+        <source>verbatim diveplan</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_it_IT.ts b/translations/subsurface_it_IT.ts
index 6109bda99..4b9f785b8 100644
--- a/translations/subsurface_it_IT.ts
+++ b/translations/subsurface_it_IT.ts
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="it_IT" version="2.0">
+<defaultcodec>UTF-8</defaultcodec>
 <context>
     <name>CylindersModel</name>
     <message>
@@ -37,42 +38,42 @@
         <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="71"/>
+        <location filename="../qt-ui/models.cpp" line="70"/>
         <source>Switch at</source>
         <translation>Cambia a</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>Facendo click qui si rimuove la bombola.</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>La bombola non può essere rimossa</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>Questo gas è in uso. Solo le bombole che non sono usate nell&apos;immersione possono essere rimosse.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="507"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="508"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="527"/>
+        <location filename="../qt-ui/models.cpp" line="532"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="528"/>
+        <location filename="../qt-ui/models.cpp" line="533"/>
         <source>cuft</source>
         <translation>piedi cubi</translation>
     </message>
@@ -100,22 +101,22 @@ il computer seleizonato?</translation>
 <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>Modello</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Device ID</source>
         <translation>ID della periferica</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Nickname</source>
         <translation>Nickname</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>Facendo click qui si rimuove questo computer.</translation>
     </message>
@@ -123,190 +124,326 @@ il computer seleizonato?</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="90"/>
-        <source>air</source>
-        <translation>aria</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="92"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</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>Bailing out in circuito aperto</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>inizio</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>fine</translation>
     </message>
 </context>
 <context>
-    <name>DiveGasPressureItem</name>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="475"/>
-        <source>air</source>
-        <translation>aria</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="476"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-</context>
-<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1258"/>
-        <source> l/min</source>
-        <translation>l/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
-        <source> cuft/min</source>
-        <translation>piedi cubi/min</translation>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <source>/min</source>
+        <translation>/min</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>Mostra la finestra di ricerca</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="706"/>
         <source>expand all</source>
         <translation>espandi tutto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="740"/>
+        <location filename="../qt-ui/divelistview.cpp" line="707"/>
         <source>collapse all</source>
         <translation>collassa tutte le voci</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="741"/>
+        <location filename="../qt-ui/divelistview.cpp" line="708"/>
         <source>collapse others</source>
         <translation>Nascondi le altre immersioni</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>rimuovi l&apos;immersione(i) dal viaggio</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>crea un nuovo viaggio sopra</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>aggiungi immersione(i) immediatamente sopra</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>Aggiungi immersione(i) al viaggio immediatamente successivo</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>unisci il viaggio con il viaggio sopra</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>unisci il viaggio con il viaggio sotto</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>cancella immersione(i)</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>segnala immersione(i) non valide</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
-        <source>save As</source>
-        <translation>Salva come</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="763"/>
-        <source>export As UDDF</source>
-        <translation>Esporta come UDDF</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="764"/>
-        <source>export As CSV</source>
-        <translation>Esporta in formato CSV</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="744"/>
+        <source>renumber dive(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="765"/>
+        <location filename="../qt-ui/divelistview.cpp" line="745"/>
         <source>shift times</source>
         <translation>Cambia l&apos;orario</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="766"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>load images</source>
         <translation>Carica immagini</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="769"/>
-        <source>upload dive(s) to divelogs.de</source>
-        <translation>Carica le immersioni a divelogs.de</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Open Image Files</source>
+        <translation>Apri file immagine</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation>Formato file immagine (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <source>merge selected dives</source>
+        <translation>unisci le immersioni selezionate</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="24"/>
+        <source>General Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="30"/>
+        <source>Export format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="42"/>
+        <source>Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="61"/>
+        <source>UDDF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="74"/>
+        <source>divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="84"/>
+        <source>CSV</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="94"/>
+        <source>Worldmap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="107"/>
+        <source>Selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="116"/>
+        <source>Selected dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="126"/>
+        <source>All dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="178"/>
+        <source>HTML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="184"/>
+        <source>General Settings</source>
+        <translation>Preferenze generali</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="190"/>
+        <source>Subsurface Numbers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="203"/>
+        <source>Selected Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="216"/>
+        <source>Minimum Javascript</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="229"/>
+        <source>All Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="239"/>
+        <source>Export List only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="252"/>
+        <source>Style Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="264"/>
+        <source>Font</source>
+        <translation>Font</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="274"/>
+        <source>Font size</source>
+        <translation>Grandezza font</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
+        <source>8</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <source>10</source>
+        <translation>10</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <source>12</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <source>14</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="795"/>
-        <source>Save Dives As...</source>
-        <translation>Salva immersioni come ...</translation>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <source>16</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="814"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <source>18</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <source>20</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="323"/>
+        <source>Theme</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <source>Sand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="153"/>
         <source>Export UDDF File as</source>
         <translation>Esporta il documento UDDF come</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>File UDDF (*.uddf *.UDDF)</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>Esporta il documento CSV come</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>CSV files (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Open Image Files</source>
-        <translation>Apri file immagine</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="162"/>
+        <source>Export World Map</source>
+        <translation>Esporta la mappa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
-        <translation>Formato file immagine (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="163"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="177"/>
+        <source>HTML files (*.html)</source>
+        <translation>File HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="760"/>
-        <source>merge selected dives</source>
-        <translation>unisci le immersioni selezionate</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="167"/>
+        <source>Export Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="168"/>
+        <source>XML files (*.xml *.ssrf)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="176"/>
+        <source>Export HTML files as</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -317,138 +454,133 @@ il computer seleizonato?</translation>
         <translation>Importa log delle immersioni da file</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="36"/>
-        <source>Import CSV Dive Log Files</source>
-        <translation>Importa log delle immersioni da file in formato CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="50"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
         <source>CSV options</source>
         <translation>Opzioni formato CSV</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="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>Separatore di campo</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>Importazioni preconfigurate</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>Configurazione Campo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="80"/>
         <source>Depth</source>
         <translation>Profondità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="100"/>
         <source>Stopdepth</source>
         <translation>Profondità della sosta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="107"/>
         <source>PO2</source>
         <translation>PO2</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>Ora</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="121"/>
         <source>Temp</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="151"/>
         <source>Cns</source>
         <translation>CNS</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>Unità</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>Metrico</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>Imperiale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="248"/>
         <source>Manual dives</source>
         <translation>Immersioni manuali</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="283"/>
         <source>Dive #</source>
         <translation>Immersione #</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="317"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="385"/>
         <source>Duration</source>
         <translation>Durata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="470"/>
         <source>Tags</source>
         <translation>Tags</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
         <source>Location</source>
         <translation>Luogo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="453"/>
         <source>Gps</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="300"/>
         <source>Max depth</source>
         <translation>Profondità massima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="334"/>
         <source>Mean depth</source>
         <translation>Profondità media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="368"/>
         <source>Buddy</source>
         <translation>Compagno</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="402"/>
         <source>Notes</source>
         <translation>Note</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="436"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
@@ -456,105 +588,70 @@ il computer seleizonato?</translation>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="71"/>
-        <source>Bottom SAC</source>
-        <translation>CAS sul fondo</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="106"/>
+        <source>Planned Dive Time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="85"/>
-        <source>SAC on DECO Stop</source>
-        <translation>CAS nella tappa di decompressione</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="134"/>
+        <source>Altitude</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="78"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="98"/>
-        <source>GFLow</source>
-        <translation>GFLow</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="125"/>
-        <source>Last Stop at 6m</source>
-        <translation>Ultima sosta a 6m</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="174"/>
-        <source>Start Time</source>
-        <translation>Ora di inizio</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="181"/>
+        <location filename="../qt-ui/diveplanner.ui" line="141"/>
         <source>ATM Pressure</source>
         <translation>Pressione Atmosferica</translation>
     </message>
-</context>
-<context>
-    <name>DivePlannerGraphics</name>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="114"/>
-        <source>10m</source>
-        <translation>10m</translation>
-    </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="116"/>
-        <source>30ft</source>
-        <translation>30 piedi</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="148"/>
+        <source>mbar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="363"/>
-        <source>Handler Position Error</source>
-        <translation>Gestore dell&apos;errore di posizione</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>
-        <translation>Una o più soste verranno perse con questa operazione,
-Per favore, rimuovile prima.</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="158"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="445"/>
-        <source>AIR</source>
-        <translation>ARIA</translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="137"/>
+        <source>unknown</source>
+        <translation>sconosciuto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1148"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="586"/>
         <source>Final Depth</source>
         <translation>Profondità finale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1150"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="588"/>
         <source>Run time</source>
         <translation>Run Time</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1152"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="590"/>
         <source>Duration</source>
         <translation>Durata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1154"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="592"/>
         <source>Used Gas</source>
         <translation>Gas usato</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>CC Set Point</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>Elimino il piano?</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>Stai cancellando il piano</translation>
     </message>
@@ -562,17 +659,17 @@ Per favore, rimuovile prima.</translation>
 <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>Punti del Dive Planner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="256"/>
         <source>Available Gases</source>
         <translation>Miscele disponibili</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>aggiungi una sosta all&apos;immersione</translation>
     </message>
@@ -616,8 +713,23 @@ Per favore, rimuovile prima.</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
-        <source>Pressure  S</source>
-        <translation>Pressione S</translation>
+        <source>Pressure S</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <source>pN₂</source>
+        <translation>pN₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>pHe</source>
+        <translation>pHe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
@@ -634,86 +746,71 @@ Per favore, rimuovile prima.</translation>
         <source>SAC</source>
         <translation>CAS</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
-        <source>PN2</source>
-        <translation>pN2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
-        <source>PHE</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
-        <source>PO2</source>
-        <translation>PO2</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>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>date</source>
         <translation>data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1298"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
+        <location filename="../qt-ui/models.cpp" line="1307"/>
         <source>suit</source>
         <translation>muta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1310"/>
         <source>cyl</source>
         <translation>bombola</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1344"/>
+        <location filename="../qt-ui/models.cpp" line="1325"/>
         <source>location</source>
         <translation>Luogo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1316"/>
         <source>SAC</source>
         <translation>CAS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1338"/>
+        <location filename="../qt-ui/models.cpp" line="1319"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1341"/>
+        <location filename="../qt-ui/models.cpp" line="1322"/>
         <source>maxCNS</source>
         <translation>max CNS</translation>
     </message>
@@ -721,115 +818,115 @@ Per favore, rimuovile prima.</translation>
 <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>Risposta non valida dal server</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>Tag XML atteso &apos;DiveDateReader&apos;, trovato invece &apos;%1</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>Tag XML atteso &apos;DiveDateReader&apos; non trovato</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>Risposta XML malformata. Linea %1: %2</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>nessuna immersione è selezionata</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>Creazione del file zip per il caricamento fallita: %s</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>Non è stato possibile creare il file temporaneo: %s</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>Errore dell&apos;applicazione: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="181"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="179"/>
         <source>internal error</source>
         <translation>errore interno</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>Fatto</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>Sto caricando la lista immersioni...</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>Sto scaricando la lista immersioni...</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>Sto scaricando %1 immersioni...</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>Scaricamento finito - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
         <source>Corrupted download</source>
         <translation>Scaricamento corrotto</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>L&apos;archivio non può essere aperto:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Upload failed</source>
         <translation>Caricamento fallito</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="849"/>
         <source>Upload successful</source>
         <translation>Caricamento eseguito</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="854"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="852"/>
         <source>Login failed</source>
         <translation>Accesso fallito</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>Non riesco ad analizzare la risposta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="868"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Error: %1</source>
         <translation>Errore: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="835"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/>
         <source>Upload finished</source>
         <translation>Caricamento finito</translation>
     </message>
@@ -837,54 +934,54 @@ Per favore, rimuovile prima.</translation>
 <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>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="165"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/>
         <source>Error</source>
         <translation>Errore</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>Riprova</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>Cerca computer Uemis</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>Scegli il file per scaricare il log dal computer subacqueo</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>Files di Log (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="339"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
         <source>Warning</source>
         <translation>Avviso</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>Il salvataggio del dump di libdivecomputer NON inserirà le immersioni nella lista delle immersioni.</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>Scegli il file di dump per il computer subacqueo</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>File di dump (*.bin)</translation>
     </message>
@@ -952,7 +1049,7 @@ Per favore, rimuovile prima.</translation>
 <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>Modifica le località d&apos;immersione selezionate</translation>
     </message>
@@ -961,848 +1058,854 @@ Per favore, rimuovile prima.</translation>
     <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>Note dell&apos;immersione</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>Luogo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="148"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Coordinates</source>
         <translation>Coordinate</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="169"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="155"/>
+        <location filename="../qt-ui/maintab.ui" line="148"/>
         <source>Buddy</source>
         <translation>Compagno</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="63"/>
-        <source>Start time</source>
-        <translation>Ora di inizio</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>Temperatura aria</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>Temperatura dell&apos;acqua</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="127"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Tags</source>
         <translation>Tags</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="223"/>
         <source>Rating</source>
         <translation>Valutazione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="236"/>
         <source>Visibility</source>
         <translation>Visibilità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="215"/>
+        <location filename="../qt-ui/maintab.ui" line="127"/>
         <source>Suit</source>
         <translation>Muta</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>Note</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="270"/>
+        <location filename="../qt-ui/maintab.ui" line="311"/>
         <source>Equipment</source>
         <translation>Attrezzatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="350"/>
+        <location filename="../qt-ui/maintab.ui" line="391"/>
         <source>Dive Info</source>
         <translation>Informazioni sull&apos;immersione</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>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="414"/>
+        <location filename="../qt-ui/maintab.ui" line="275"/>
+        <source>Time</source>
+        <translation>Ora</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="455"/>
         <source>Interval</source>
         <translation>Intervallo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="433"/>
+        <location filename="../qt-ui/maintab.ui" line="474"/>
         <source>Gases Used</source>
         <translation>Gas usati</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="452"/>
+        <location filename="../qt-ui/maintab.ui" line="493"/>
         <source>Gas Consumed</source>
         <translation>Gas consumato</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>CAS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="531"/>
         <source>Max. Depth</source>
         <translation>Profondità max</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="509"/>
+        <location filename="../qt-ui/maintab.ui" line="550"/>
         <source>Ave. Depth</source>
         <translation>Profondità media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="528"/>
+        <location filename="../qt-ui/maintab.ui" line="569"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="547"/>
+        <location filename="../qt-ui/maintab.ui" line="588"/>
         <source>Air Pressure</source>
         <translation>Pressione aria</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="566"/>
+        <location filename="../qt-ui/maintab.ui" line="607"/>
         <source>Air Temperature</source>
         <translation>Temperatura aria</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="585"/>
+        <location filename="../qt-ui/maintab.ui" line="626"/>
         <source>Water Temperature</source>
         <translation>Temperatura dell&apos;acqua</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="604"/>
+        <location filename="../qt-ui/maintab.ui" line="645"/>
         <source>Dive Time</source>
         <translation>Tempo d&apos;Immersione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="623"/>
+        <location filename="../qt-ui/maintab.ui" line="664"/>
         <source>Salinity</source>
         <translation>Salinità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="660"/>
+        <location filename="../qt-ui/maintab.ui" line="701"/>
         <source>Stats</source>
         <translation>Statistiche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="746"/>
         <source>Depth</source>
         <translation>Profondità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="784"/>
         <source>Duration</source>
         <translation>Durata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Total Time</source>
         <translation>Tempo Totale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="835"/>
         <source>Dives</source>
         <translation>Immersioni</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="919"/>
+        <source>Photos</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="89"/>
         <source>Cylinders</source>
         <translation>Bombole</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="90"/>
         <source>Add Cylinder</source>
         <translation>Aggiungi bombola</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="93"/>
         <source>Weights</source>
         <translation>Pesi</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>Aggiungi un tipo di pesi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="438"/>
+        <location filename="../qt-ui/maintab.cpp" line="409"/>
         <source>Trip Location</source>
         <translation>Luogo del viaggio</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>Note di viaggio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="42"/>
+        <location filename="../qt-ui/maintab.cpp" line="48"/>
         <source>Save</source>
         <translation>Salva</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="46"/>
+        <location filename="../qt-ui/maintab.cpp" line="52"/>
         <source>Cancel</source>
         <translation>Annulla</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>Temperatura dell&apos;aria [%1]</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>Temperatura dell&apos;acqua [%1]</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>Questo viaggio è stato editato.</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>Si stanno modificando immersioni multiple.</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>Si sta modificando questa immersione </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>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="494"/>
+        <location filename="../qt-ui/maintab.cpp" line="464"/>
         <source>unknown</source>
         <translation>sconosciuto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>N</source>
-        <translation>N</translation>
+        <location filename="../qt-ui/maintab.cpp" line="501"/>
+        <source>Deepest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>S</source>
-        <translation>S</translation>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <source>Shallowest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>E</source>
-        <translation>E</translation>
+        <location filename="../qt-ui/maintab.cpp" line="794"/>
+        <source>Discard the Changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>W</source>
-        <translation>W</translation>
+        <location filename="../qt-ui/maintab.cpp" line="795"/>
+        <source>You are about to discard your changes.</source>
+        <translation type="unfinished"/>
     </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>Filtro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="571"/>
+        <location filename="../qt-ui/mainwindow.ui" line="646"/>
         <source>&amp;File</source>
         <translation>&amp;File</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="583"/>
+        <source>Print</source>
+        <translation>Stampa</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:'Courier'; 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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="606"/>
+        <location filename="../qt-ui/mainwindow.ui" line="679"/>
         <source>&amp;View</source>
         <translation>&amp;Vista</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="628"/>
+        <location filename="../qt-ui/mainwindow.ui" line="701"/>
         <source>&amp;Help</source>
         <translation>&amp;Aiuto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="636"/>
+        <location filename="../qt-ui/mainwindow.ui" line="709"/>
         <source>&amp;Import</source>
         <translation>&amp;Importa</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>&amp;Nuovo logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="655"/>
+        <location filename="../qt-ui/mainwindow.ui" line="728"/>
         <source>New</source>
         <translation>Nuovo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="658"/>
+        <location filename="../qt-ui/mainwindow.ui" line="731"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</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>&amp;Apri logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="666"/>
+        <location filename="../qt-ui/mainwindow.ui" line="739"/>
         <source>Open</source>
         <translation>Apri</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <location filename="../qt-ui/mainwindow.ui" line="742"/>
         <source>Ctrl+O</source>
         <translation>Ctrl-O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="674"/>
+        <location filename="../qt-ui/mainwindow.ui" line="747"/>
         <source>&amp;Save</source>
         <translation>&amp;Salva</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="677"/>
+        <location filename="../qt-ui/mainwindow.ui" line="750"/>
         <source>Save</source>
         <translation>Salva</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="680"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>Save as</source>
         <translation>Salva come</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>Ctrl+Shift+S</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>&amp;Chiudi</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="702"/>
+        <location filename="../qt-ui/mainwindow.ui" line="775"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="902"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <source>P&amp;references</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="831"/>
+        <source>&amp;Add Dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <source>Auto &amp;Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="863"/>
+        <source>&amp;Dive List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="871"/>
+        <source>&amp;Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="879"/>
+        <source>&amp;Info</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="887"/>
+        <source>&amp;All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="895"/>
+        <source>P&amp;rev DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="903"/>
+        <source>&amp;Next DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="911"/>
+        <source>&amp;Select Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <source>&amp;About Subsurface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="937"/>
+        <source>&amp;Globe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="953"/>
+        <source>&amp;Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="959"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="707"/>
-        <source>Export &amp;UDDF</source>
-        <translation>Esporta &amp;UUDF</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="1008"/>
+        <source>&amp;Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1011"/>
+        <source>Export Dive Logs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1014"/>
+        <source>Ctrl+E</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Enable the pN2 Graph</source>
         <translation>Abilita il grafico pN2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <location filename="../qt-ui/mainwindow.ui" line="128"/>
         <source>Enable the pHe graph</source>
         <translation>Abilita il grafico pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <location filename="../qt-ui/mainwindow.ui" line="290"/>
         <source>Show/hide heart rate</source>
         <translation>Mostra/Nascondi il battito cardiaco</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <location filename="../qt-ui/mainwindow.ui" line="342"/>
         <source>Enable EAD, END, and EADD</source>
         <translation>Abilità EAD, END e EADD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="238"/>
         <source>Show NDL / TTS</source>
         <translation>Mostra NDL / TTS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="456"/>
+        <location filename="../qt-ui/mainwindow.ui" line="394"/>
         <source>Rescale depth axis</source>
         <translation>Cambia la scala dell&apos;asse della profondità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="710"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl-U</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="715"/>
-        <source>Export HTML World Map</source>
-        <translation>Esporta la mappa in HTML</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="718"/>
-        <source>Ctrl+H</source>
-        <translation>Control+H</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="723"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>&amp;Print</source>
         <translation>&amp;Stampa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="734"/>
+        <location filename="../qt-ui/mainwindow.ui" line="791"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="742"/>
+        <location filename="../qt-ui/mainwindow.ui" line="799"/>
         <source>&amp;Quit</source>
         <translation>&amp;Esci</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="753"/>
+        <location filename="../qt-ui/mainwindow.ui" line="810"/>
         <source>Import from &amp;dive computer</source>
         <translation>Importa &amp;dal computer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="818"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation>Importa dati &amp;GPS del servizio Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="764"/>
+        <location filename="../qt-ui/mainwindow.ui" line="821"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="826"/>
         <source>&amp;Edit Device Names</source>
         <translation>&amp;Modifica il nome della periferica</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="834"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="782"/>
+        <location filename="../qt-ui/mainwindow.ui" line="839"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Rinumera</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="785"/>
+        <location filename="../qt-ui/mainwindow.ui" line="842"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="798"/>
+        <location filename="../qt-ui/mainwindow.ui" line="855"/>
         <source>&amp;Yearly Statistics</source>
         <translation>&amp;Statistiche Annuali</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="801"/>
+        <location filename="../qt-ui/mainwindow.ui" line="858"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="806"/>
-        <source>Dive List</source>
-        <translation>Lista immersioni</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="814"/>
-        <source>Profile</source>
-        <translation>Profilo</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="822"/>
-        <source>Info</source>
-        <translation>Informazioni</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="830"/>
-        <source>All</source>
-        <translation>Tutti</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="872"/>
+        <location filename="../qt-ui/mainwindow.ui" line="929"/>
         <source>User &amp;Manual</source>
         <translation>&amp;Manuale Utente</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="880"/>
-        <source>Globe</source>
-        <translation>Globo</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="888"/>
+        <location filename="../qt-ui/mainwindow.ui" line="945"/>
         <source>P&amp;lan Dive</source>
         <translation>Pianifica immersione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="891"/>
+        <location filename="../qt-ui/mainwindow.ui" line="948"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="907"/>
-        <source>Import from Divelogs.de</source>
-        <translation>Importa da Divelogs.de</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1003"/>
         <source>&amp;Check for Updates</source>
         <translation>&amp;Controlla gli aggiornamenti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="951"/>
-        <source>Export CSV</source>
-        <translation>Esporta CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="726"/>
+        <location filename="../qt-ui/mainwindow.ui" line="783"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</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>Abilita grafico pO₂</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>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="316"/>
         <source>Enable MOD</source>
         <translation>Abilita MOD</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>Mostra il ceiling riportato dal computer</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>Mostra il ceiling calcolato</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>Mostra il ceiling calcolato con incrementi di 3m</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>Calcola tutti i tessuti</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>Mostra il consumo equivalente di superficie (SAC)</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>Abilita / Disabilita righello</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="731"/>
-        <source>Preferences</source>
-        <translation>Preferenze</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="745"/>
+        <location filename="../qt-ui/mainwindow.ui" line="802"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="756"/>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="774"/>
-        <source>Add Dive</source>
-        <translation>Aggiungi immersione</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="793"/>
-        <source>Auto Group</source>
-        <translation>Raggruppamento Automatico</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="809"/>
+        <location filename="../qt-ui/mainwindow.ui" line="866"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="817"/>
+        <location filename="../qt-ui/mainwindow.ui" line="874"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <location filename="../qt-ui/mainwindow.ui" line="882"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="833"/>
+        <location filename="../qt-ui/mainwindow.ui" line="890"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="838"/>
-        <source>Prev DC</source>
-        <translation>DC precedente</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="841"/>
+        <location filename="../qt-ui/mainwindow.ui" line="898"/>
         <source>Left</source>
         <translation>Sinistra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="846"/>
-        <source>Next DC</source>
-        <translation>DC successivo</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="849"/>
+        <location filename="../qt-ui/mainwindow.ui" line="906"/>
         <source>Right</source>
         <translation>Destra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="854"/>
-        <source>Select Events</source>
-        <translation>Seleziona eventi</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <location filename="../qt-ui/mainwindow.ui" line="916"/>
         <source>Input Plan</source>
         <translation>Piano in ingresso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="864"/>
-        <source>About Subsurface</source>
-        <translation>Informazioni su Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="875"/>
+        <location filename="../qt-ui/mainwindow.ui" line="932"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="883"/>
+        <location filename="../qt-ui/mainwindow.ui" line="940"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="896"/>
-        <source>Import Log Files</source>
-        <translation>Importa logbook da file</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="899"/>
+        <location filename="../qt-ui/mainwindow.ui" line="956"/>
         <source>Import divelog files from other applications</source>
         <translation>Importa log delle immersioni da altra applicazioni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="915"/>
+        <location filename="../qt-ui/mainwindow.ui" line="964"/>
+        <source>Import &amp;from Divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="972"/>
         <source>&amp;Full Screen</source>
         <translation>&amp;Tutto Schermo</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>Abilita Modalità Tutto Schermo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <location filename="../qt-ui/mainwindow.ui" line="978"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="174"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
         <source>Open File</source>
         <translation>Apri File</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>Per favore, salva o cancella le modifiche all&apos;immersione prima di chiudere il file.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="330"/>
-        <source>Please save or cancel the current dive edit before trying to plan a dive.</source>
-        <translation>Per favore, salva o cancella le modifiche all&apos;immersione prima di pianificare un&apos;altra immersione.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="396"/>
+        <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>Per favore, salva o cancella le modifiche all&apos;immersione prima di aggiungerne un&apos;altra.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="645"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="419"/>
+        <source>Print runtime table</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="710"/>
         <source>Do you want to save the changes you made in the file %1?</source>
         <translation>Vuoi salvare le modifiche fatte nel file %1?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="647"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="712"/>
         <source>Do you want to save the changes you made in the datafile?</source>
         <translation>Vuoi salvare le modifiche fatte nel datafile?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="652"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="717"/>
         <source>Save Changes?</source>
         <translation>Salvare le modifiche?</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>Le modifiche saranno perse se tu non le salvi.</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>Salva come</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>Avviso</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>Per favore, salva o cancella le modifiche all&apos;immersione prima di aprire un nuovo file.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="280"/>
-        <source>Export UDDF File as</source>
-        <translation>Esporta il documento UDDF come</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="281"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>File UDDF (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="289"/>
-        <source>Export CSV File as</source>
-        <translation>Esporta il documento CSV come</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="290"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>CSV files (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="299"/>
-        <source>Export World Map</source>
-        <translation>Esporta la mappa</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="300"/>
-        <source>HTML files (*.html)</source>
-        <translation>File HTML (*.html)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="449"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="514"/>
         <source>Yearly Statistics</source>
         <translation>Statistiche Annuali</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="961"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1076"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>File XML Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1199"/>
         <source>Open Dive Log File</source>
         <translation>Apri file di log immersioni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <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>Formato del file di log (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;Formato XML(*.xml);;Formato UDDF/UDCF(*.uddf *.udcf);;Formato di log JDive(*.jlb);;Formato Suunto(*.sde *.db);;Formato CSV(*.csv);;Tutti i formati(*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1225"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Per favore, prima completa le modifiche corrente prima di aggiungerne altre.</translation>
     </message>
 </context>
 <context>
+    <name>PlannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Last stop at 20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="416"/>
+        <source>Last stop at 6m</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>PreferencesDialog</name>
     <message>
         <location filename="../qt-ui/preferences.ui" line="85"/>
@@ -1825,247 +1928,297 @@ Per favore, rimuovile prima.</translation>
         <translation>Lingua</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="151"/>
         <source>Lists and Tables</source>
         <translation>Liste e tabelle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="167"/>
         <source>Font size</source>
         <translation>Grandezza font</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="170"/>
+        <location filename="../qt-ui/preferences.ui" line="180"/>
         <source>Dives</source>
         <translation>Immersioni</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>File immersione di default</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="188"/>
+        <location filename="../qt-ui/preferences.ui" line="198"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="197"/>
+        <location filename="../qt-ui/preferences.ui" line="207"/>
         <source>Display Invalid</source>
         <translation>Visualizzazione errata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="214"/>
+        <location filename="../qt-ui/preferences.ui" line="224"/>
         <source>Default Cylinder</source>
         <translation>Bombola di default</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>Usa questa bombola come default</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <location filename="../qt-ui/preferences.ui" line="247"/>
         <source>Animations</source>
         <translation>Animazioni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <location filename="../qt-ui/preferences.ui" line="253"/>
         <source>Speed</source>
         <translation>Velocità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="270"/>
+        <location filename="../qt-ui/preferences.ui" line="280"/>
         <source>Subsurface Webservice</source>
         <translation>Servizio WEB di Subsurface</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>ID Utente di default</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>Salva l&apos;ID dell&apos;utente localmente?</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="312"/>
+        <source>Reset all settings to their default value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
         <source>System</source>
         <translation>Sistema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="348"/>
         <source>Metric</source>
         <translation>Metrico</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="333"/>
+        <location filename="../qt-ui/preferences.ui" line="358"/>
         <source>Imperial</source>
         <translation>Imperiale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="343"/>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
         <source>Personalize</source>
         <translation>Personalizza</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="392"/>
         <source>Depth</source>
         <translation>Profondità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="374"/>
+        <location filename="../qt-ui/preferences.ui" line="399"/>
         <source>meter</source>
         <translation>metri</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="409"/>
         <source>feet</source>
         <translation>piedi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="401"/>
+        <location filename="../qt-ui/preferences.ui" line="426"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="411"/>
+        <location filename="../qt-ui/preferences.ui" line="436"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="428"/>
+        <location filename="../qt-ui/preferences.ui" line="453"/>
         <source>liter</source>
         <translation>litro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="438"/>
+        <location filename="../qt-ui/preferences.ui" line="463"/>
         <source>cu ft</source>
         <translation>piedi cubici</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="455"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="465"/>
+        <location filename="../qt-ui/preferences.ui" line="490"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="482"/>
+        <location filename="../qt-ui/preferences.ui" line="507"/>
         <source>kg</source>
         <translation>kg</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>soglia quando è visibile la pO₂</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>soglia quando è visibile la pN₂</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>soglia quando è visibile la pHe</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="636"/>
-        <source>max ppO₂ when showing MOD</source>
-        <translation>max ppO₂ quando è visibile la MOD</translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="811"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="817"/>
+        <source>Proxy type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="830"/>
+        <source>Host</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="856"/>
+        <source>Port</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="882"/>
+        <source>Requires authentication</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="657"/>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="925"/>
+        <source>Password</source>
+        <translation>Password</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="682"/>
         <source>draw dive computer reported ceiling red</source>
         <translation>Colora di rosso il ceiling riportato dal computer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="747"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>System Default</source>
         <translation>Usa Lingua di sistema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="767"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>Filter</source>
         <translation>Filtro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="419"/>
         <source>Pressure</source>
         <translation>Pressione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="421"/>
+        <location filename="../qt-ui/preferences.ui" line="446"/>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="448"/>
+        <location filename="../qt-ui/preferences.ui" line="473"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="475"/>
+        <location filename="../qt-ui/preferences.ui" line="500"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="517"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="507"/>
+        <location filename="../qt-ui/preferences.ui" line="532"/>
         <source>Time units</source>
         <translation>Unità di Tempo</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>Denominatore della Risalita/Discesa </translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="520"/>
+        <location filename="../qt-ui/preferences.ui" line="545"/>
         <source>Minutes</source>
         <translation>Minuti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="530"/>
+        <location filename="../qt-ui/preferences.ui" line="555"/>
         <source>Seconds</source>
         <translation>Secondi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="562"/>
+        <location filename="../qt-ui/preferences.ui" line="587"/>
         <source>Show</source>
         <translation>Mostra</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="693"/>
         <source>Show non-used cylinders in Equipment Tab</source>
         <translation>Mostra le bombole non usate nella finestra attrezzatura</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>Mostra la profondità media</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>GFLow alla massima profondità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="691"/>
+        <location filename="../qt-ui/preferences.ui" line="716"/>
         <source>Misc</source>
         <translation>Varie</translation>
     </message>
@@ -2075,35 +2228,65 @@ Per favore, rimuovile prima.</translation>
         <translation>Preferenze</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="697"/>
+        <location filename="../qt-ui/preferences.ui" line="722"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="739"/>
         <source>GFHigh</source>
         <translation>GFHigh</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="24"/>
+        <source>System proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="25"/>
+        <source>HTTP proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="26"/>
+        <source>SOCKS proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="245"/>
         <source>Restart required</source>
         <translation>Richiesto riavvio</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>Per caricare correttamente la nuova lingua è richiesto il riavvio di Subsurface.</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>Apri il log di default</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>File XML Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="394"/>
+        <source>Warning</source>
+        <translation>Avviso</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"/>
+    </message>
 </context>
 <context>
     <name>PrintDialog</name>
@@ -2244,72 +2427,72 @@ Per favore, rimuovile prima.</translation>
 <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>sconosciuto</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>Immersione #%1 - %2</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>Massima profondità: %1 %2</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>Durata: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1918"/>
+        <location filename="../qt-ui/models.cpp" line="1898"/>
         <source>Gas Used:</source>
         <translation>Miscela usata:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1920"/>
+        <location filename="../qt-ui/models.cpp" line="1900"/>
         <source>SAC:</source>
         <translation>CAS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1922"/>
+        <location filename="../qt-ui/models.cpp" line="1902"/>
         <source>Max. CNS:</source>
         <translation>Max. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1924"/>
+        <location filename="../qt-ui/models.cpp" line="1904"/>
         <source>Weights:</source>
         <translation>Pesi:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1929"/>
+        <location filename="../qt-ui/models.cpp" line="1909"/>
         <source>Notes:</source>
         <translation>Note:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1936"/>
+        <location filename="../qt-ui/models.cpp" line="1916"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1938"/>
+        <location filename="../qt-ui/models.cpp" line="1918"/>
         <source>Buddy:</source>
         <translation>Compagno:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1940"/>
+        <location filename="../qt-ui/models.cpp" line="1920"/>
         <source>Suit:</source>
         <translation>Muta:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1942"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>Viz:</source>
         <translation>Visibilità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1944"/>
+        <location filename="../qt-ui/models.cpp" line="1924"/>
         <source>Rating:</source>
         <translation>Valutazione:</translation>
     </message>
@@ -2317,62 +2500,77 @@ Per favore, rimuovile prima.</translation>
 <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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/>
+        <source>Make first divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="906"/>
+        <source>Delete this divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="913"/>
         <source>Add Gas Change</source>
         <translation>Aggiungi una miscela</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>Aggiungi un segnalibro</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>Rimuovi evento</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>Nascondi eventi simili</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>Modifica il nome</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>Mostra tutti gli eventi</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>Nascondi gli eventi</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>Nascondi tutti gli eventi %1?</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>Rimuovere l&apos;evento selezionato?</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>%1 @ %2:%3</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>Modifica il nome del bookmark</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>Nome personalizzato:</translation>
     </message>
@@ -2380,12 +2578,12 @@ Per favore, rimuovile prima.</translation>
 <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>ARIA</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>Rimuovi questo punto</translation>
     </message>
@@ -2395,22 +2593,22 @@ Per favore, rimuovile prima.</translation>
         <translation>Chiudi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="34"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation>Media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="37"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation>Minimo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="40"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation>Massimo</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>Spostare la mappa e fare doppio-click per definire la posizione dell&apos;immersione</translation>
     </message>
@@ -2424,9 +2622,23 @@ Per favore, rimuovile prima.</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="128"/>
         <source>New starting number</source>
         <translation>Nuovo numero di inizio</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="126"/>
+        <source>New number</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchBar</name>
+    <message>
+        <location filename="../qt-ui/searchbar.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ShiftImageTimesDialog</name>
@@ -2441,42 +2653,47 @@ Per favore, rimuovile prima.</translation>
         <translation>Sposta l&apos;orario delle immagini di</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="102"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="95"/>
+        <source>h:mm</source>
+        <translation>h:mm</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="105"/>
         <source>earlier</source>
         <translation>prima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="109"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="112"/>
         <source>later</source>
         <translation>dopo</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>Per calcolare la differenza dell&apos;orologio del tuo computer e della tua fotocamera, fai una foto al tuo computer che mostra l&apos;orologio. Scarica questa immagina sul tuo computer e premi questo bottone.</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>Determina la differenza d&apos;ora della fotocamera</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>Selezione un&apos;immagine del computer che mostra l&apos;ora</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>Quale data ed orario sono mostrati nell&apos;immagine?</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>Apri file immagine</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>Formato file immagine (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2556,42 +2773,42 @@ Per favore, rimuovile prima.</translation>
 <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>Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/>
         <source>Connecting...</source>
         <translation>In connessione...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="421"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="419"/>
         <source>Download finished</source>
         <translation>Download finito</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>Errore scaricamento: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/>
         <source>Connection Error: </source>
         <translation>Errore di connessione:</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>Identificatore dell&apos;utente non valido!</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>Non posso analizzare la risposta!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/>
         <source>Download Success!</source>
         <translation>Download effettuato!</translation>
     </message>
@@ -2607,17 +2824,17 @@ Per favore, rimuovile prima.</translation>
 <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>Descrizione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2625,7 +2842,7 @@ Per favore, rimuovile prima.</translation>
 <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>Informazione</translation>
     </message>
@@ -2633,42 +2850,42 @@ Per favore, rimuovile prima.</translation>
 <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>Controlla gli aggiornamenti.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="37"/>
-        <source>&lt;h3&gt;Subsurface was unable to check for updates.&lt;/h3&gt;</source>
-        <translation>&lt;h3&gt;Subsurface non è riuscito a controllare gli aggiornamenti.&lt;/h3&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="36"/>
+        <source>Subsurface was unable to check for updates.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
-        <source>&lt;br/&gt;&lt;b&gt;The following error occurred:&lt;/b&gt;&lt;br/&gt;</source>
-        <translation>&lt;br/&gt;&lt;b&gt;S&apos;è verificato il seguente errore:&lt;/b&gt;&lt;br/&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="41"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="43"/>
-        <source>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Please check your internet connection.&lt;/b&gt;</source>
-        <translation>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Per favore controlla la tua connessione Internet.&lt;/b&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
     </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>Stai usando l&apos;ultima versione di Subsurface.</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>È disponibile una nuova version di Subsurface.&lt;br/&gt;Puoi scaricarla qui: &lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt;.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="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>&lt;b&gt;È disponibile una nuova versione di Subsurface.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</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>S&apos;è verificato un errore nella ricerca degli aggiornamenti.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -2676,25 +2893,163 @@ Per favore, rimuovile prima.</translation>
 <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>Manuale Utente</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>Manuale di Subsurface non trovato</translation>
     </message>
 </context>
 <context>
+    <name>UserSurvey</name>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="47"/>
+        <source>Subsurface User Survey</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="79"/>
+        <source>Recreational DIver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="92"/>
+        <source>Tech Diver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="105"/>
+        <source>Interested in dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="118"/>
+        <source>I am downloading dives from supported dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="131"/>
+        <source>I am importing dives from other software / sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="144"/>
+        <source>I am manually entering dives</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="190"/>
+        <source>Please type suggestions (in English) in the following box</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="27"/>
+        <source>
+Operating System: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="30"/>
+        <source>
+CPU Architecture: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="35"/>
+        <source>
+OS CPU Architecture %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="39"/>
+        <source>
+Language: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="73"/>
+        <source>Should we ask you later?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="74"/>
+        <source>Don&apos;t ask me again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="75"/>
+        <source>Ask Later</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="76"/>
+        <source>Ask again?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <source>Submit User Survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <source>Subsurface was unable to submit the user survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="101"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="102"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="111"/>
+        <source>Survey successfully submitted.</source>
+        <translation type="unfinished"/>
+    </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>S&apos;è verificato un errore nella ricerca degli aggiornamenti.&lt;br/&gt;&lt;br/&gt;%1</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>Descrizione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="723"/>
+        <location filename="../qt-ui/models.cpp" line="721"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2742,12 +3097,12 @@ Per favore, rimuovile prima.</translation>
         <translation>Invia</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>L&apos;operazione è durata troppo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="279"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="277"/>
         <source>Transfering data...</source>
         <translation>Trasferimento dati...</translation>
     </message>
@@ -2755,37 +3110,37 @@ Per favore, rimuovile prima.</translation>
 <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>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="368"/>
+        <location filename="../qt-ui/models.cpp" line="373"/>
         <source>Weight</source>
         <translation>Peso</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>Facendo click qui si rimuove il sistema di pesi.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="453"/>
+        <location filename="../qt-ui/models.cpp" line="458"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="454"/>
+        <location filename="../qt-ui/models.cpp" line="459"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="478"/>
+        <location filename="../qt-ui/models.cpp" line="483"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="484"/>
         <source>m</source>
         <translation>m</translation>
     </message>
@@ -2793,79 +3148,79 @@ Per favore, rimuovile prima.</translation>
 <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>Anno 
 &gt; Mese / Viaggio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1643"/>
         <source>Duration 
  Total</source>
         <translation>Durata 
 Totale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>
 Average</source>
         <translation>
 Media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>
 Shortest</source>
         <translation>
 Più corta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>
 Longest</source>
         <translation>
 Più lunga</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>Profondità (%1)
 Media</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>
 Minimo</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>
 Massimo</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>SAC (%1)
 Media</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>Temp. (%1)
@@ -2875,99 +3230,92 @@ Media</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="58"/>
+        <location filename="../dive.c" line="87"/>
         <source>pascal</source>
         <translation>pascal</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>bar</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>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="104"/>
-        <location filename="../qt-gui.cpp" line="292"/>
-        <source>l</source>
-        <translation>l</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>piedi cubi</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>m</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>ft</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>lbs</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>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1120"/>
+        <location filename="../dive.c" line="1237"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) oder (%s)</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>aria</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="170"/>
+        <location filename="../equipment.c" line="210"/>
         <source>integrated</source>
         <translation>integrato</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="171"/>
+        <location filename="../equipment.c" line="211"/>
         <source>belt</source>
         <translation>cintura</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="172"/>
+        <location filename="../equipment.c" line="212"/>
         <source>ankle</source>
         <translation>caviglia</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="173"/>
+        <location filename="../equipment.c" line="213"/>
         <source>backplate weight</source>
         <translation>peso della piastra</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="174"/>
+        <location filename="../equipment.c" line="214"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -2984,234 +3332,234 @@ Media</translation>
         <translation>Il numero massimo di colonne supportate nel file CSV è di %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>none</source>
         <translation>nessuno</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>deco stop</source>
         <translation>deco stop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ascent</source>
         <translation>risalita</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ceiling</source>
         <translation>ceiling</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>workload</source>
         <translation>carico di lavoro</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>transmitter</source>
         <translation>trasmettitore</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>violation</source>
         <translation>violazione</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>bookmark</source>
         <translation>segnalibro</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>surface</source>
         <translation>superficie</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>safety stop</source>
         <translation>sosta di sicurezza</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>cambio gas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (voluntary)</source>
         <translation>sosta di sicurezza (facoltativa)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (mandatory)</source>
         <translation>sosta di sicurezza (obbligatoria)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>deepstop</source>
         <translation>deepstop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>ceiling (safety stop)</source>
         <translation>ceiling (sosta di sicurezza)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>divetime</source>
         <translation>durata immersione</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>sotto il piano</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>maxdepth</source>
         <translation>profondità massima</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>airtime</source>
         <translation>tempo in aria</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>heading</source>
         <translation>intestazione</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>tissue level warning</source>
         <translation>avviso del livello dei tessuti</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>non stop time</source>
         <translation>tempo di non stop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="163"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>invalid event number</source>
         <translation>numero evento non valido</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>Impossibile creare un parser per %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="411"/>
+        <location filename="../libdivecomputer.c" line="414"/>
         <source>Error registering the data</source>
         <translation>Errore registrando la data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="419"/>
+        <location filename="../libdivecomputer.c" line="422"/>
         <source>Error parsing the datetime</source>
         <translation>Errore analizzando la data/il tempo</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="438"/>
         <source>Dive %d: %s %d %04d</source>
         <translation>Immersione #%d: %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="440"/>
+        <location filename="../libdivecomputer.c" line="443"/>
         <source>Error parsing the divetime</source>
         <translation>Errore analizzando il tempo di immersione</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="449"/>
+        <location filename="../libdivecomputer.c" line="452"/>
         <source>Error parsing the maxdepth</source>
         <translation>Errore analizzando la profondità massima</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="458"/>
+        <location filename="../libdivecomputer.c" line="461"/>
         <source>Error parsing the gas mix count</source>
         <translation>Errore analizzando il conteggio della miscela di gas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="470"/>
+        <location filename="../libdivecomputer.c" line="473"/>
         <source>Error obtaining water salinity</source>
         <translation>Errore nell&apos;ottenimento della salinità dell&apos;acqua</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error obtaining surface pressure</source>
         <translation>Errore nell&apos;ottenere la pressione superficiale</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the gas mix</source>
         <translation>Errore analizzando la miscela di gas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="493"/>
+        <location filename="../libdivecomputer.c" line="496"/>
         <source>Error parsing the samples</source>
         <translation>Errore analizzando i campioni</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="623"/>
+        <location filename="../libdivecomputer.c" line="626"/>
         <source>Event: waiting for user action</source>
         <translation>Evento: in attesa dell&apos; azione dell&apos;utente.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="631"/>
+        <location filename="../libdivecomputer.c" line="634"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>modello=%u (0x%08x), firmware=%u (0x%08x), numero di serie=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="691"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the event handler.</source>
         <translation>Errore registrando il gestore degli eventi.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="696"/>
+        <location filename="../libdivecomputer.c" line="699"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Errore registrando il gestore della cancellazione.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="717"/>
+        <location filename="../libdivecomputer.c" line="720"/>
         <source>Dive data import error</source>
         <translation>Errore importazione dati immersione</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="756"/>
+        <location filename="../libdivecomputer.c" line="759"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Impossibile creare un contesto libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="763"/>
+        <location filename="../libdivecomputer.c" line="766"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Impossibile aprire %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="462"/>
+        <location filename="../parse-xml.c" line="466"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Lettura di strane percentuali %s
@@ -3219,19 +3567,19 @@ Media</translation>
 </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>Impossibile analizzare  &apos;%s&apos;</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>Interrogazione get_events fallita.
 </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>La query get_tags sul database non è riuscita.
@@ -3245,29 +3593,29 @@ Media</translation>
 </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 '%s'.
 </source>
         <translation>Interrogazione al database fallita &apos;%s&apos;.
 </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>La query get_cylinders sul database non è riuscita.
 </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>La query get_changes sul database non è riuscita.
 </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>La query get_profile_sample sul database non è riuscita.
@@ -3275,82 +3623,131 @@ Media</translation>
 </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>Non é possibile aprire il foglio di stile %s</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>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="146"/>
-        <location filename="../planner.c" line="617"/>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation>Non trovo il gas %d/%d</translation>
+        <location filename="../planner.c" line="159"/>
+        <location filename="../planner.c" line="752"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="308"/>
+        <location filename="../planner.c" line="345"/>
         <source>Too many gas mixes</source>
         <translation>Troppe miscele gas</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="489"/>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation>%s
-Piano d&apos;immersione di Subsurface 
-basato su GFlow = %.0f e GFhigh = %.0f
-
-</translation>
+        <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>DISCLAIMER / AVVISO: QUESTA È UNA NUOVA IMPLEMENTAZIONE DELL&apos;ALGORITMO DI BUHLMANN E DELL&apos;IMPLEMENTAZIONE DEL  PIANO DI IMMERSIONE BASATO SU CIÒ CHE HA RICEVUTO SOLO UNA LIMITATA QUANTITA&apos; DI TEST. E&apos; ALTAMENTE RACCOMANDATO DI NON PIANIFICARE IMMERSIONI BASATE SEMPLICEMENTE SUI RISULTATI DATI QUI.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="530"/>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Transizione a %.*f %s in %d:%02d min - tempo %d:%02u su %s
-</translation>
+        <location filename="../planner.c" line="535"/>
+        <source>based on GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="539"/>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Fermati a %.*f %s per %d:%02d min - tempo trascorso %d:%02u su %s
-</translation>
+        <location filename="../planner.c" line="538"/>
+        <source>Subsurface dive plan</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="550"/>
-        <source>Switch gas to %s
-</source>
-        <translation>Cambiare gas a %s
-</translation>
+        <location filename="../planner.c" line="542"/>
+        <source>depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="558"/>
-        <source>Gas consumption:
-</source>
-        <translation>Consumo gas:
-</translation>
+        <location filename="../planner.c" line="545"/>
+        <source>runtime</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="569"/>
-        <source>%.0f%s of %s
-</source>
-        <translation>%.0f%s di %s
-</translation>
+        <location filename="../planner.c" line="548"/>
+        <source>duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="551"/>
+        <source>gas</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </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"/>
     </message>
     <message>
-        <location filename="../planner.c" line="810"/>
+        <location filename="../planner.c" line="606"/>
+        <source>%3.0f%s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
+        <source>%3dmin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="629"/>
+        <source>Switch gas to %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="638"/>
+        <source>Gas consumption:</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="659"/>
+        <source>this is more gas than available in the specified cylinder!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="664"/>
+        <source>not enough reserve for gas sharing on ascent!</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="668"/>
+        <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="980"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1226"/>
+        <location filename="../profile.c" line="1250"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3359,70 +3756,69 @@ D:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1229"/>
+        <location filename="../profile.c" line="1253"/>
         <source>P: %d%s
 </source>
         <translation>P:%d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1233"/>
+        <location filename="../profile.c" line="1257"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1263"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </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>SAC: %2.1fl/min
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1244"/>
+        <location filename="../profile.c" line="1268"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1246"/>
+        <location filename="../profile.c" line="1270"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO₂%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1272"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN₂ %s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="1274"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="1277"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1260"/>
+        <location filename="../profile.c" line="1284"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3431,7 +3827,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1264"/>
+        <location filename="../profile.c" line="1288"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3440,401 +3836,394 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1276"/>
+        <location filename="../profile.c" line="1300"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Sosta di sicurezza: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1279"/>
+        <location filename="../profile.c" line="1303"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Sosta di sicurezza: </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="1308"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
+        <location filename="../profile.c" line="1311"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: temo di sosta sconosciuto @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1291"/>
+        <location filename="../profile.c" line="1315"/>
         <source>In deco
 </source>
         <translation>In deco
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1293"/>
+        <location filename="../profile.c" line="1317"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1297"/>
+        <location filename="../profile.c" line="1321"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1305"/>
+        <location filename="../profile.c" line="1329"/>
         <source>In deco (calc)
 </source>
         <translation>In deco (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1307"/>
+        <location filename="../profile.c" line="1331"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL:%umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1310"/>
+        <location filename="../profile.c" line="1334"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1313"/>
+        <location filename="../profile.c" line="1337"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Ceiling calcolato %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1319"/>
+        <location filename="../profile.c" line="1343"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Tessuto %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1325"/>
+        <location filename="../profile.c" line="1349"/>
         <source>heartbeat: %d
 </source>
         <translation>Battito cardiaco: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1327"/>
+        <location filename="../profile.c" line="1351"/>
         <source>bearing: %d
 </source>
         <translation>Direzione: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1419"/>
+        <location filename="../profile.c" line="1443"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</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>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1435"/>
+        <location filename="../profile.c" line="1459"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1439"/>
+        <location filename="../profile.c" line="1463"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</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>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1454"/>
+        <location filename="../profile.c" line="1478"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="273"/>
+        <location filename="../qt-gui.cpp" line="281"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="276"/>
+        <location filename="../qt-gui.cpp" line="284"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="392"/>
-        <source>%1, %2 %3, %4 %5:%6</source>
-        <translation>%1, %2 %3, %4 %5:%6</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="405"/>
-        <source>%1 %2, %3
-%4:%5</source>
-        <translation>%1 %2, %3
-%4:%5</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="418"/>
+        <location filename="../qt-gui.cpp" line="417"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 immersioni)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="423"/>
+        <location filename="../qt-gui.cpp" line="422"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 immersione)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>boat</source>
         <translation>barca</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>shore</source>
         <translation>riva</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>drift</source>
         <translation>in corrente</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>deep</source>
         <translation>profondo</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>cavern</source>
         <translation>caverna</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>ice</source>
         <translation>ghiaccio</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>wreck</source>
         <translation>relitto</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>cave</source>
         <translation>grotta</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>altitude</source>
         <translation>altitudine</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>pool</source>
         <translation>piscina</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>lake</source>
         <translation>lago</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>river</source>
         <translation>fiume</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>night</source>
         <translation>notte</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>fresh</source>
         <translation>acqua dolce</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>student</source>
         <translation>allievo</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>photo</source>
         <translation>foto</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>video</source>
         <translation>video</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>instructor</source>
         <translation>istruttore</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="25"/>
         <source>deco</source>
         <translation>deco</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="216"/>
+        <location filename="../dive.c" line="133"/>
+        <source>ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="214"/>
         <source>more than %d days</source>
         <translation>più di %d giorni</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="220"/>
         <source>%dd %dh %dmin</source>
         <translation>%dt %dst %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="224"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dh %dmin</source>
         <translation>%dst %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="235"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation>per l&apos;immersione #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="242"/>
+        <location filename="../statistics.c" line="240"/>
         <source>for selected dives</source>
         <translation>per le immersioni selezionate</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="275"/>
         <source>for dive #%d</source>
         <translation>per l&apos;immersione #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for selected dive</source>
         <translation>per l&apos;immersione selezionata</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for all dives</source>
         <translation>per tutte le immersioni</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="283"/>
+        <location filename="../statistics.c" line="281"/>
         <source>(no dives)</source>
         <translation>(nessuna immersione)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Mon</source>
         <translation>Lun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Tue</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Wed</source>
         <translation>Mer</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Thu</source>
         <translation>Gio</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Fri</source>
         <translation>Ven</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sat</source>
         <translation>Sab</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jan</source>
         <translation>Gen</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>May</source>
         <translation>Mag</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jun</source>
         <translation>Giu</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Jul</source>
         <translation>Lug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Aug</source>
         <translation>Ago</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Sep</source>
         <translation>Set</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Oct</source>
         <translation>Ott</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Dec</source>
         <translation>Dic</translation>
     </message>
@@ -3864,97 +4253,97 @@ Is the Uemis Zurich plugged in correctly?</source>
 Lo Uemis Zurich e&apos; collegato correttamente?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="107"/>
+        <location filename="../uemis-downloader.c" line="111"/>
         <source>unknown</source>
         <translation>sconosciuto</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="379"/>
+        <location filename="../uemis-downloader.c" line="383"/>
         <source>Reading %s %s</source>
         <translation>Sto leggendo %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="399"/>
+        <location filename="../uemis-downloader.c" line="403"/>
         <source>data</source>
         <translation>data</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="420"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>divelog entry id</source>
         <translation>id del log d&apos;immersione</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="422"/>
+        <location filename="../uemis-downloader.c" line="426"/>
         <source>divespot data id</source>
         <translation>data id di divespot</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
+        <location filename="../uemis-downloader.c" line="428"/>
         <source>more data dive id</source>
         <translation>più id di dati d&apos;immersione</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>wetsuit</source>
         <translation>muta umida</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>semidry</source>
         <translation>semi stagna</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>drysuit</source>
         <translation>Muta stagna</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>shorty</source>
         <translation>shorty</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>vest</source>
         <translation>maglia</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>long john</source>
         <translation>long john</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>jacket</source>
         <translation>GAV</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>full suit</source>
         <translation>muta intera</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>2 pcs full suit</source>
         <translation>Muta intera 2 pezzi</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="620"/>
+        <location filename="../uemis-downloader.c" line="624"/>
         <source>membrane</source>
         <translation>membrana</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="802"/>
+        <location filename="../uemis-downloader.c" line="823"/>
         <source>Init Communication</source>
         <translation>Inizializzo la comunicazione</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="804"/>
+        <location filename="../uemis-downloader.c" line="825"/>
         <source>Uemis init failed</source>
         <translation>Impossibile inizializzare l&apos;Uemis</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="815"/>
+        <location filename="../uemis-downloader.c" line="836"/>
         <source>Start download</source>
         <translation>Inizio download</translation>
     </message>
@@ -3975,18 +4364,18 @@ Lo Uemis Zurich e&apos; collegato correttamente?</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="203"/>
-        <source>PO2 Green Warning</source>
-        <translation>Avviso PO2 Verde</translation>
+        <source>pO₂ Green Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
-        <source>PO2 Ascend Warning</source>
-        <translation>Avviso Incremento PO2</translation>
+        <source>pO₂ Ascend Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="208"/>
-        <source>PO2 Ascend Alarm</source>
-        <translation>Allarme Incremento PO2</translation>
+        <source>pO₂ Ascend Alarm</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
@@ -4048,5 +4437,214 @@ Lo Uemis Zurich e&apos; collegato correttamente?</translation>
         <source>Low Battery Alert</source>
         <translation>Allarme: Batteria scarica</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"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="36"/>
+        <source>Date:</source>
+        <translation>Data:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="38"/>
+        <source>Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="40"/>
+        <source>Duration:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="41"/>
+        <source>min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="43"/>
+        <source>Max Depth:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="46"/>
+        <source>Air Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="48"/>
+        <source>Water Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="50"/>
+        <source>Location:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="54"/>
+        <source>Notes:</source>
+        <translation>Note:</translation>
+    </message>
+</context>
+<context>
+    <name>plannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="35"/>
+        <source>Rates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="56"/>
+        <source>Ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="77"/>
+        <source>below 75% avg. depth</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="94"/>
+        <source>75%-50% avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="111"/>
+        <source>50% avg. depth - 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="128"/>
+        <source>6m/20ft to surface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="148"/>
+        <source>Descent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="200"/>
+        <source>surface to the bottom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="226"/>
+        <source>Planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="247"/>
+        <source>GF low</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="264"/>
+        <source>GF high</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
+        <source>Drop to first depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
+        <source>Last Stop at 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>plan backgas breaks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="318"/>
+        <source>Gas Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <source>bottom SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="349"/>
+        <source>deco SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="359"/>
+        <source>bottom pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="389"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="382"/>
+        <source>deco pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="421"/>
+        <source>Dive Notes</source>
+        <translation>Note dell&apos;immersione</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="445"/>
+        <source>display runtime</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="458"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="461"/>
+        <source>display segment duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="471"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="474"/>
+        <source>display transitions in deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="481"/>
+        <source>verbatim diveplan</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_lv_LV.ts b/translations/subsurface_lv_LV.ts
index 069e235b4..6f429d261 100644
--- a/translations/subsurface_lv_LV.ts
+++ b/translations/subsurface_lv_LV.ts
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="lv_LV" version="2.0">
+<defaultcodec>UTF-8</defaultcodec>
 <context>
     <name>CylindersModel</name>
     <message>
@@ -37,42 +38,42 @@
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="71"/>
+        <location filename="../qt-ui/models.cpp" line="70"/>
         <source>Switch at</source>
         <translation>Pārslēgties uz</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>Noklikšķot šeit Jūs noņemsiet balonu.</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>Balons never būt noņemts.</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>Šī gāze jau ir pielietota. Var noņemt tikai tos cilindrus, kuri nav pielietoti niršanā.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="507"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="508"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="527"/>
+        <location filename="../qt-ui/models.cpp" line="532"/>
         <source>l</source>
         <translation>Es</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="528"/>
+        <location filename="../qt-ui/models.cpp" line="533"/>
         <source>cuft</source>
         <translation>kub. pēda</translation>
     </message>
@@ -100,22 +101,22 @@ likvidēt izvēlētus datorus?</translation>
 <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>Modelis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Device ID</source>
         <translation>Ierīces ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Nickname</source>
         <translation>Lietotājvārds</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>Noklikšķot šeit Jūs noņemsiet niršanas datoru.</translation>
     </message>
@@ -123,190 +124,326 @@ likvidēt izvēlētus datorus?</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="90"/>
-        <source>air</source>
-        <translation>gaiss</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="92"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</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>Pāreja uz OC</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>Kļūda: %1</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>beigas</translation>
     </message>
 </context>
 <context>
-    <name>DiveGasPressureItem</name>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="475"/>
-        <source>air</source>
-        <translation>gaisa</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="476"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-</context>
-<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1258"/>
-        <source> l/min</source>
-        <translation>l/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
-        <source> cuft/min</source>
-        <translation>kub.pedas/min</translation>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <source>/min</source>
+        <translation>/min</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>Parādīt meklēšanas logu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="706"/>
         <source>expand all</source>
         <translation>izvērst visu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="740"/>
+        <location filename="../qt-ui/divelistview.cpp" line="707"/>
         <source>collapse all</source>
         <translation>savērst visu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="741"/>
+        <location filename="../qt-ui/divelistview.cpp" line="708"/>
         <source>collapse others</source>
         <translation>savērst pārējus</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>noņemt niršanas reizi(-es) no ceļojuma</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>izveidot jaunu ceļojumu augšup</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>nekavējoties pievienot niršanu(-as) ceļojumam augšup</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>tūlītēji pievienot niršanu(-as) pie apakšēja ceļojuma</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>saplūdināt ceļojumu ar augšējo</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>saplūdināt ceļojumu ar apakšējo</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>izdzēst niršanu(-as)</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>atzīmēt niršanu(-as) kā nepareizus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
-        <source>save As</source>
-        <translation>saglabāt kā</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="763"/>
-        <source>export As UDDF</source>
-        <translation>eksportēt kā UDDF</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="764"/>
-        <source>export As CSV</source>
-        <translation>Eksportēt kā CSV</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="744"/>
+        <source>renumber dive(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="765"/>
+        <location filename="../qt-ui/divelistview.cpp" line="745"/>
         <source>shift times</source>
         <translation>nobīdīt laikus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="766"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>load images</source>
         <translation>ielādēt attēlus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="769"/>
-        <source>upload dive(s) to divelogs.de</source>
-        <translation>augšupielādēt niršana(s) uz Divelogs.de</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Open Image Files</source>
+        <translation>Atvērt attēlus</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation>Attēlu faili (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <source>merge selected dives</source>
+        <translation>saplūdināt izvēlētas niršanas</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="24"/>
+        <source>General Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="30"/>
+        <source>Export format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="42"/>
+        <source>Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="61"/>
+        <source>UDDF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="74"/>
+        <source>divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="84"/>
+        <source>CSV</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="94"/>
+        <source>Worldmap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="107"/>
+        <source>Selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="116"/>
+        <source>Selected dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="126"/>
+        <source>All dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="178"/>
+        <source>HTML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="184"/>
+        <source>General Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="190"/>
+        <source>Subsurface Numbers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="203"/>
+        <source>Selected Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="216"/>
+        <source>Minimum Javascript</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="229"/>
+        <source>All Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="239"/>
+        <source>Export List only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="252"/>
+        <source>Style Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="264"/>
+        <source>Font</source>
+        <translation>Fonts</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="274"/>
+        <source>Font size</source>
+        <translation>Fonta izmērs</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
+        <source>8</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <source>10</source>
+        <translation>10</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <source>12</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <source>14</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <source>16</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <source>18</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="795"/>
-        <source>Save Dives As...</source>
-        <translation>Saglābāt niršanu kā...</translation>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <source>20</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="814"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="323"/>
+        <source>Theme</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <source>Sand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="153"/>
         <source>Export UDDF File as</source>
         <translation>Eksportēt UDDF failu kā</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>UDDF faili (*.uddf *.UDDF)</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>Eksportēt CSV failu kā</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>CSV faili (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Open Image Files</source>
-        <translation>Atvērt attēlus</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="162"/>
+        <source>Export World Map</source>
+        <translation>Eksportēt pasaules karti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
-        <translation>Attēlu faili (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="163"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="177"/>
+        <source>HTML files (*.html)</source>
+        <translation>HTML faili (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="760"/>
-        <source>merge selected dives</source>
-        <translation>saplūdināt izvēlētas niršanas</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="167"/>
+        <source>Export Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="168"/>
+        <source>XML files (*.xml *.ssrf)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="176"/>
+        <source>Export HTML files as</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -317,138 +454,133 @@ likvidēt izvēlētus datorus?</translation>
         <translation>Niršanas žurnālu importēšana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="36"/>
-        <source>Import CSV Dive Log Files</source>
-        <translation>CSV žurnālu imports</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="50"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
         <source>CSV options</source>
         <translation>CSV opcijas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="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>Lauka atdalītājs</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>Importa veidnes</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>Lauka konfigurēšana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="80"/>
         <source>Depth</source>
         <translation>Dziļums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="100"/>
         <source>Stopdepth</source>
         <translation>Pieturas dziļums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="107"/>
         <source>PO2</source>
         <translation>PO₂</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>Laiks</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="121"/>
         <source>Temp</source>
         <translation>Temp.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="151"/>
         <source>Cns</source>
         <translation>CNS</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>Vienības</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>Metrisks</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>Imperiāls</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="248"/>
         <source>Manual dives</source>
         <translation>Roku niršanas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="283"/>
         <source>Dive #</source>
         <translation>Niršana #</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="317"/>
         <source>Date</source>
         <translation>Datums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="385"/>
         <source>Duration</source>
         <translation>Ilgums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="470"/>
         <source>Tags</source>
         <translation>Tagi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
         <source>Location</source>
         <translation>Vieta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="453"/>
         <source>Gps</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="300"/>
         <source>Max depth</source>
         <translation>Maks. dziļums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="334"/>
         <source>Mean depth</source>
         <translation>Vid. dziļums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="368"/>
         <source>Buddy</source>
         <translation>Draugs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="402"/>
         <source>Notes</source>
         <translation>Piezīmes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="436"/>
         <source>Weight</source>
         <translation>Svars</translation>
     </message>
@@ -456,105 +588,70 @@ likvidēt izvēlētus datorus?</translation>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="71"/>
-        <source>Bottom SAC</source>
-        <translation>Apakšējais SAC</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="106"/>
+        <source>Planned Dive Time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="85"/>
-        <source>SAC on DECO Stop</source>
-        <translation>SAC uz DECO apstāšanās</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="134"/>
+        <source>Altitude</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="78"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="98"/>
-        <source>GFLow</source>
-        <translation>GFLow</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="125"/>
-        <source>Last Stop at 6m</source>
-        <translation>Pēdēja pietura uz 6m</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="174"/>
-        <source>Start Time</source>
-        <translation>Uzsākšanas laiks</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="181"/>
+        <location filename="../qt-ui/diveplanner.ui" line="141"/>
         <source>ATM Pressure</source>
         <translation>Atmosfēras spiediens</translation>
     </message>
-</context>
-<context>
-    <name>DivePlannerGraphics</name>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="114"/>
-        <source>10m</source>
-        <translation>10m</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="116"/>
-        <source>30ft</source>
-        <translation>30ft</translation>
-    </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="363"/>
-        <source>Handler Position Error</source>
-        <translation>Apstrādātāja pozicijas kļūda</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="148"/>
+        <source>mbar</source>
+        <translation type="unfinished"/>
     </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>
-        <translation>Viena vai vairākas pieturas pazudīs pēc šīs operācijas,
-Lūdzu, sākumā likvidējiet tos.</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="158"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="445"/>
-        <source>AIR</source>
-        <translation>Gaisa</translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="137"/>
+        <source>unknown</source>
+        <translation>nezināms</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1148"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="586"/>
         <source>Final Depth</source>
         <translation>Gala dziļums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1150"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="588"/>
         <source>Run time</source>
         <translation>Izpildes laiks</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1152"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="590"/>
         <source>Duration</source>
         <translation>Ilgums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1154"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="592"/>
         <source>Used Gas</source>
         <translation>Izmantojama gāze</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>CC regulēšana</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>Atcelt plānu?</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>Jūs taisāties atcelt plānu.</translation>
     </message>
@@ -562,17 +659,17 @@ Lūdzu, sākumā likvidējiet tos.</translation>
 <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>Niršanas vietas.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="256"/>
         <source>Available Gases</source>
         <translation>Pieejamas gāzes</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>pievienot niršanas vietu</translation>
     </message>
@@ -616,8 +713,23 @@ Lūdzu, sākumā likvidējiet tos.</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
-        <source>Pressure  S</source>
-        <translation>Spiediens S</translation>
+        <source>Pressure S</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <source>pN₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>pHe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>pO₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
@@ -634,86 +746,71 @@ Lūdzu, sākumā likvidējiet tos.</translation>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
-        <source>PN2</source>
-        <translation>pN₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
-        <source>PHE</source>
-        <translation>PHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
-        <source>PO2</source>
-        <translation>PO₂</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>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>date</source>
         <translation>datums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>ft</source>
         <translation>pedas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1298"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>lbs</source>
         <translation>mārciņa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
+        <location filename="../qt-ui/models.cpp" line="1307"/>
         <source>suit</source>
         <translation>kostīms</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1310"/>
         <source>cyl</source>
         <translation>balons</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1344"/>
+        <location filename="../qt-ui/models.cpp" line="1325"/>
         <source>location</source>
         <translation>vieta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1316"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1338"/>
+        <location filename="../qt-ui/models.cpp" line="1319"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1341"/>
+        <location filename="../qt-ui/models.cpp" line="1322"/>
         <source>maxCNS</source>
         <translation>maxCNS</translation>
     </message>
@@ -721,115 +818,115 @@ Lūdzu, sākumā likvidējiet tos.</translation>
 <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>Nederīga servera atbilde</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>Gaidīja XML tagu &apos;DiveDateReader&apos;, bet saņēma &apos;%1</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>Gaidīts XML tags &apos;DiveDates&apos; nav atrasts</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>Kļūdaina XML atbilde. Līnija %1: %2</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>neviena niršana nebija izvēlēta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="130"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>neizdevas izveidot ZIP failu augšupielādēšanai: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="153"/>
         <source>cannot create temporary file: %s</source>
         <translation>nevar izveidot pagaidu failu: %s</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>iekšēja kļūda: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="181"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="179"/>
         <source>internal error</source>
         <translation>iekšēja kļūda</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>Izdarīts</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>Augšupielādē niršanas sarakstu...</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>Niršanas saraksta lejupielādēšana...</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>Lejupielādē %1 niršanas...</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>Lejupielādēšana pabeigta - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
         <source>Corrupted download</source>
         <translation>Bojāta lejupielādēšana</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>Nevar atvērt arhīvu:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Upload failed</source>
         <translation>Augšupielādēšana neizdodas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="849"/>
         <source>Upload successful</source>
         <translation>Sekmīga augšupielādēšana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="854"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="852"/>
         <source>Login failed</source>
         <translation>Pieteikšanās neizdevās</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>Nevar noparsēt atbildi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="868"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Error: %1</source>
         <translation>Kļūda: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="835"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/>
         <source>Upload finished</source>
         <translation>Augšupielādēšana ir pabeigta</translation>
     </message>
@@ -837,54 +934,54 @@ Lūdzu, sākumā likvidējiet tos.</translation>
 <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>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="165"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/>
         <source>Error</source>
         <translation>Kļūda</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>Atkārtot</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>Atrast Uemis niršanas datoru</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>Izvēliet failu priekš žurnāla lejupielādēšanas no niršanas datora</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>Žurnalēšanas faili (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="339"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
         <source>Warning</source>
         <translation>Brīdinājums</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>Saglabājot izraksti, niršanas NEsaglabājas niršanas sarakstā.</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>Izvēliet failu priekš niršanas datora bināra izraksta</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>Izraksta faili (*.bin)</translation>
     </message>
@@ -952,7 +1049,7 @@ Lūdzu, sākumā likvidējiet tos.</translation>
 <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>Rediģēt izvēlētas niršanas vietas</translation>
     </message>
@@ -961,848 +1058,854 @@ Lūdzu, sākumā likvidējiet tos.</translation>
     <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>Niršanas piezīmes</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>Vieta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="148"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Coordinates</source>
         <translation>Koordinātas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="169"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
         <source>Divemaster</source>
         <translation>Niršanas speciālists</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="155"/>
+        <location filename="../qt-ui/maintab.ui" line="148"/>
         <source>Buddy</source>
         <translation>Draugs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="63"/>
-        <source>Start time</source>
-        <translation>Uzsākšanas laiks</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>Gaisa temp.</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>Ūdens temp.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="127"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Tags</source>
         <translation>Tagi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="223"/>
         <source>Rating</source>
         <translation>Novērtējums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="236"/>
         <source>Visibility</source>
         <translation>Redzamība</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="215"/>
+        <location filename="../qt-ui/maintab.ui" line="127"/>
         <source>Suit</source>
         <translation>Kostīms</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>Piezīmes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="270"/>
+        <location filename="../qt-ui/maintab.ui" line="311"/>
         <source>Equipment</source>
         <translation>Aprīkojums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="350"/>
+        <location filename="../qt-ui/maintab.ui" line="391"/>
         <source>Dive Info</source>
         <translation>Niršanas informācija</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>Datums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="414"/>
+        <location filename="../qt-ui/maintab.ui" line="275"/>
+        <source>Time</source>
+        <translation>Laiks</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="455"/>
         <source>Interval</source>
         <translation>Intervāls</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="433"/>
+        <location filename="../qt-ui/maintab.ui" line="474"/>
         <source>Gases Used</source>
         <translation>Izmant. gāzes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="452"/>
+        <location filename="../qt-ui/maintab.ui" line="493"/>
         <source>Gas Consumed</source>
         <translation>Patērēta gāze</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>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="531"/>
         <source>Max. Depth</source>
         <translation>Maks. dziļums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="509"/>
+        <location filename="../qt-ui/maintab.ui" line="550"/>
         <source>Ave. Depth</source>
         <translation>Vid. dziļums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="528"/>
+        <location filename="../qt-ui/maintab.ui" line="569"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="547"/>
+        <location filename="../qt-ui/maintab.ui" line="588"/>
         <source>Air Pressure</source>
         <translation>Gaisa spiediens</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="566"/>
+        <location filename="../qt-ui/maintab.ui" line="607"/>
         <source>Air Temperature</source>
         <translation>Gaisa temperatūra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="585"/>
+        <location filename="../qt-ui/maintab.ui" line="626"/>
         <source>Water Temperature</source>
         <translation>Ūdens temperatūra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="604"/>
+        <location filename="../qt-ui/maintab.ui" line="645"/>
         <source>Dive Time</source>
         <translation>Niršanas laiks</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="623"/>
+        <location filename="../qt-ui/maintab.ui" line="664"/>
         <source>Salinity</source>
         <translation>Sāļums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="660"/>
+        <location filename="../qt-ui/maintab.ui" line="701"/>
         <source>Stats</source>
         <translation>Statistika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="746"/>
         <source>Depth</source>
         <translation>Dziļums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Temperature</source>
         <translation>Temperatūra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="784"/>
         <source>Duration</source>
         <translation>Ilgums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Total Time</source>
         <translation>Kopējais laiks</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="835"/>
         <source>Dives</source>
         <translation>Niršanas</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="919"/>
+        <source>Photos</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="89"/>
         <source>Cylinders</source>
         <translation>Cilindri</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="90"/>
         <source>Add Cylinder</source>
         <translation>Pievienot cilindri</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="93"/>
         <source>Weights</source>
         <translation>Sver</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>Pievienot svara sistēmu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="438"/>
+        <location filename="../qt-ui/maintab.cpp" line="409"/>
         <source>Trip Location</source>
         <translation>Ceļojuma vieta</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>Ceļojuma piezīmes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="42"/>
+        <location filename="../qt-ui/maintab.cpp" line="48"/>
         <source>Save</source>
         <translation>Saglabāt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="46"/>
+        <location filename="../qt-ui/maintab.cpp" line="52"/>
         <source>Cancel</source>
         <translation>Dzēst</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>Gaisa temp. [%1]</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>Ūdens temp. [%1]</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>Ceļojuma rediģēšana.</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>Daudzkārtīga ceļojumu rediģēšana.</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>Niršanas rediģēšana.</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>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="494"/>
+        <location filename="../qt-ui/maintab.cpp" line="464"/>
         <source>unknown</source>
         <translation>nezināms</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>N</source>
-        <translation>Z</translation>
+        <location filename="../qt-ui/maintab.cpp" line="501"/>
+        <source>Deepest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>S</source>
-        <translation>D</translation>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <source>Shallowest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>E</source>
-        <translation>A</translation>
+        <location filename="../qt-ui/maintab.cpp" line="794"/>
+        <source>Discard the Changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>W</source>
-        <translation>R</translation>
+        <location filename="../qt-ui/maintab.cpp" line="795"/>
+        <source>You are about to discard your changes.</source>
+        <translation type="unfinished"/>
     </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>Filtrs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="571"/>
+        <location filename="../qt-ui/mainwindow.ui" line="646"/>
         <source>&amp;File</source>
         <translation>&amp;Fails</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="583"/>
+        <source>Print</source>
+        <translation>Drukāt</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:'Courier'; 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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
         <source>&amp;Log</source>
         <translation>&amp;Žurnāls</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="606"/>
+        <location filename="../qt-ui/mainwindow.ui" line="679"/>
         <source>&amp;View</source>
         <translation>&amp;Skats</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="628"/>
+        <location filename="../qt-ui/mainwindow.ui" line="701"/>
         <source>&amp;Help</source>
         <translation>&amp;Palīdzība</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="636"/>
+        <location filename="../qt-ui/mainwindow.ui" line="709"/>
         <source>&amp;Import</source>
         <translation>&amp;Imports</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>&amp;Jauns žunāls</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="655"/>
+        <location filename="../qt-ui/mainwindow.ui" line="728"/>
         <source>New</source>
         <translation>Jauns</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="658"/>
+        <location filename="../qt-ui/mainwindow.ui" line="731"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</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>&amp;Atvērt žurnālu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="666"/>
+        <location filename="../qt-ui/mainwindow.ui" line="739"/>
         <source>Open</source>
         <translation>Atvērt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <location filename="../qt-ui/mainwindow.ui" line="742"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="674"/>
+        <location filename="../qt-ui/mainwindow.ui" line="747"/>
         <source>&amp;Save</source>
         <translation>&amp;Saglabāt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="677"/>
+        <location filename="../qt-ui/mainwindow.ui" line="750"/>
         <source>Save</source>
         <translation>Saglabāt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="680"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>Save as</source>
         <translation>Saglabāt kā</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>Ctrl+Shift+S</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>Azivērt</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Close</source>
         <translation>Aizvērt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="702"/>
+        <location filename="../qt-ui/mainwindow.ui" line="775"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+w</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="902"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <source>P&amp;references</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="831"/>
+        <source>&amp;Add Dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <source>Auto &amp;Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="863"/>
+        <source>&amp;Dive List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="871"/>
+        <source>&amp;Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="879"/>
+        <source>&amp;Info</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="887"/>
+        <source>&amp;All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="895"/>
+        <source>P&amp;rev DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="903"/>
+        <source>&amp;Next DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="911"/>
+        <source>&amp;Select Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <source>&amp;About Subsurface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="937"/>
+        <source>&amp;Globe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="953"/>
+        <source>&amp;Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="959"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="707"/>
-        <source>Export &amp;UDDF</source>
-        <translation>Eksportēt &amp;UDDF</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="1008"/>
+        <source>&amp;Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1011"/>
+        <source>Export Dive Logs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1014"/>
+        <source>Ctrl+E</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Enable the pN2 Graph</source>
         <translation>Parādīt pN₂ grafiku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <location filename="../qt-ui/mainwindow.ui" line="128"/>
         <source>Enable the pHe graph</source>
         <translation>Parādīt pHe grafiku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <location filename="../qt-ui/mainwindow.ui" line="290"/>
         <source>Show/hide heart rate</source>
         <translation>Parādīt/paslēpt pulsu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <location filename="../qt-ui/mainwindow.ui" line="342"/>
         <source>Enable EAD, END, and EADD</source>
         <translation>Parādīt EAD, END un EADD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="238"/>
         <source>Show NDL / TTS</source>
         <translation>Parādīt NDL / TTS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="456"/>
+        <location filename="../qt-ui/mainwindow.ui" line="394"/>
         <source>Rescale depth axis</source>
         <translation>Manīt asa mērogu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="710"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="715"/>
-        <source>Export HTML World Map</source>
-        <translation>Eksportēt HTML pasaules karti</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="718"/>
-        <source>Ctrl+H</source>
-        <translation>Ctrl+H</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="723"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>&amp;Print</source>
         <translation>&amp;Drukāt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="734"/>
+        <location filename="../qt-ui/mainwindow.ui" line="791"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="742"/>
+        <location filename="../qt-ui/mainwindow.ui" line="799"/>
         <source>&amp;Quit</source>
         <translation>&amp;Pabeigt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="753"/>
+        <location filename="../qt-ui/mainwindow.ui" line="810"/>
         <source>Import from &amp;dive computer</source>
         <translation>Importēt no &amp;niršanas datora</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="818"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation>Importēt &amp;GPS datus no Subsurface servissa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="764"/>
+        <location filename="../qt-ui/mainwindow.ui" line="821"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="826"/>
         <source>&amp;Edit Device Names</source>
         <translation>&amp;Rediģēt ierīces vārdu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="834"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="782"/>
+        <location filename="../qt-ui/mainwindow.ui" line="839"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Pārnumurēt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="785"/>
+        <location filename="../qt-ui/mainwindow.ui" line="842"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="798"/>
+        <location filename="../qt-ui/mainwindow.ui" line="855"/>
         <source>&amp;Yearly Statistics</source>
         <translation>&amp;Gada statistika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="801"/>
+        <location filename="../qt-ui/mainwindow.ui" line="858"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="806"/>
-        <source>Dive List</source>
-        <translation>Niršanas saraksts</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="814"/>
-        <source>Profile</source>
-        <translation>Profils</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="822"/>
-        <source>Info</source>
-        <translation>Info</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="830"/>
-        <source>All</source>
-        <translation>Visi</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="872"/>
+        <location filename="../qt-ui/mainwindow.ui" line="929"/>
         <source>User &amp;Manual</source>
         <translation>Lietotāja &amp;apmācība</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="880"/>
-        <source>Globe</source>
-        <translation>Karte</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="888"/>
+        <location filename="../qt-ui/mainwindow.ui" line="945"/>
         <source>P&amp;lan Dive</source>
         <translation>Plānotājs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="891"/>
+        <location filename="../qt-ui/mainwindow.ui" line="948"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="907"/>
-        <source>Import from Divelogs.de</source>
-        <translation>Importēt no Divelogs.de</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1003"/>
         <source>&amp;Check for Updates</source>
         <translation>Pārbaudīt atjaunāšanas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="951"/>
-        <source>Export CSV</source>
-        <translation>Eksportēt CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="726"/>
+        <location filename="../qt-ui/mainwindow.ui" line="783"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</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>Parādīt pO₂ grafiku</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>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="316"/>
         <source>Enable MOD</source>
         <translation>Parādīt MOD</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>Parādīt paziņotu maksimālu deko. pieturu</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>Parādīt aprēķināto maksimālo dekompr. pieturu</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>Parādīt aprēķināto maksimālo dekompr. pieturu ar 3m intervālu</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>Aprēķināt visus audu līmeņus</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>Parādīt SAC</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>Ieslēgt / Izslēgt lienālu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="731"/>
-        <source>Preferences</source>
-        <translation>Priekšrocības</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="745"/>
+        <location filename="../qt-ui/mainwindow.ui" line="802"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="756"/>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="774"/>
-        <source>Add Dive</source>
-        <translation>Pievienot niršanu</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="793"/>
-        <source>Auto Group</source>
-        <translation>Auto-grupēšana</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="809"/>
+        <location filename="../qt-ui/mainwindow.ui" line="866"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="817"/>
+        <location filename="../qt-ui/mainwindow.ui" line="874"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <location filename="../qt-ui/mainwindow.ui" line="882"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="833"/>
+        <location filename="../qt-ui/mainwindow.ui" line="890"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="838"/>
-        <source>Prev DC</source>
-        <translation>Iepr. DC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="841"/>
+        <location filename="../qt-ui/mainwindow.ui" line="898"/>
         <source>Left</source>
         <translation>Pa kreisi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="846"/>
-        <source>Next DC</source>
-        <translation>Nākamais DC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="849"/>
+        <location filename="../qt-ui/mainwindow.ui" line="906"/>
         <source>Right</source>
         <translation>Pa labi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="854"/>
-        <source>Select Events</source>
-        <translation>Izvēlēt notikumus</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <location filename="../qt-ui/mainwindow.ui" line="916"/>
         <source>Input Plan</source>
         <translation>Ievādīt plānu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="864"/>
-        <source>About Subsurface</source>
-        <translation>Par Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="875"/>
+        <location filename="../qt-ui/mainwindow.ui" line="932"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="883"/>
+        <location filename="../qt-ui/mainwindow.ui" line="940"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="896"/>
-        <source>Import Log Files</source>
-        <translation>Importēt žurnalēšanas failu</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="899"/>
+        <location filename="../qt-ui/mainwindow.ui" line="956"/>
         <source>Import divelog files from other applications</source>
         <translation>Importēt žurnālus no citām programmām</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="915"/>
+        <location filename="../qt-ui/mainwindow.ui" line="964"/>
+        <source>Import &amp;from Divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="972"/>
         <source>&amp;Full Screen</source>
         <translation>Pilnekrāna režīms</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>Pārslēgt pilnekrāna režīmu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <location filename="../qt-ui/mainwindow.ui" line="978"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="174"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
         <source>Open File</source>
         <translation>Atvērt failu</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>Lūdzu, saglabājiet vai atceliet pašreizējo niršanu rediģēšanu pirms fails aizvēršanas.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="330"/>
-        <source>Please save or cancel the current dive edit before trying to plan a dive.</source>
-        <translation>Lūdzu, saglabājiet vai atceliet pašreizējo niršanu rediģēšanu pirms niršanas plānošanas.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="396"/>
+        <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>Lūdzu, saglabājiet vai atceliet pašreizējo niršanu rediģēšanu pirms niršanas pievienošanas.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="645"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="419"/>
+        <source>Print runtime table</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="710"/>
         <source>Do you want to save the changes you made in the file %1?</source>
         <translation>Vai velāties saglabāt izmaiņas datnē %1?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="647"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="712"/>
         <source>Do you want to save the changes you made in the datafile?</source>
         <translation>Vai velāties saglabāt izmaiņas datnes datu datnē?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="652"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="717"/>
         <source>Save Changes?</source>
         <translation>Saglabāt izmaiņas?</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>Izmaiņas pazūs, ja tos nesaglabāt.</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>Saglabāt datni kā</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>Brīdinājums</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>Lūdzu, saglabājiet vai atceliet pašreizējo niršanu rediģēšanu pirms jauna faila atveršanas.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="280"/>
-        <source>Export UDDF File as</source>
-        <translation>Eksportēt UDDF failu kā</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="281"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>UDDF faili (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="289"/>
-        <source>Export CSV File as</source>
-        <translation>Eksportēt CSV failu kā</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="290"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>CSV faili (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="299"/>
-        <source>Export World Map</source>
-        <translation>Eksportēt pasaules karti</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="300"/>
-        <source>HTML files (*.html)</source>
-        <translation>HTML faili (*.html)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="449"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="514"/>
         <source>Yearly Statistics</source>
         <translation>Gada statistika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="961"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1076"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML datnes (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1199"/>
         <source>Open Dive Log File</source>
         <translation>Atvērt niršanas žurnālu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <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>Niršanas žurnāla faili  (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML Files (*.xml);;UDDF/UDCF Files(*.uddf *.udcf);;JDiveLog Files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1225"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Lūdzu, pabeidziet tekošo rediģēšanu pirms mēģinot citu.</translation>
     </message>
 </context>
 <context>
+    <name>PlannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Last stop at 20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="416"/>
+        <source>Last stop at 6m</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>PreferencesDialog</name>
     <message>
         <location filename="../qt-ui/preferences.ui" line="85"/>
@@ -1825,247 +1928,297 @@ Lūdzu, sākumā likvidējiet tos.</translation>
         <translation>Valoda</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="151"/>
         <source>Lists and Tables</source>
         <translation>Saraksti un tabulas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font</source>
         <translation>Fonts</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="167"/>
         <source>Font size</source>
         <translation>Fonta izmērs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="170"/>
+        <location filename="../qt-ui/preferences.ui" line="180"/>
         <source>Dives</source>
         <translation>Niršanas</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>Noklusējama niršanas datne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="188"/>
+        <location filename="../qt-ui/preferences.ui" line="198"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="197"/>
+        <location filename="../qt-ui/preferences.ui" line="207"/>
         <source>Display Invalid</source>
         <translation>Izrādīt nederīgu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="214"/>
+        <location filename="../qt-ui/preferences.ui" line="224"/>
         <source>Default Cylinder</source>
         <translation>Noklusējamais balons</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>Izmantot noklusējamo balonu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <location filename="../qt-ui/preferences.ui" line="247"/>
         <source>Animations</source>
         <translation>Animācija</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <location filename="../qt-ui/preferences.ui" line="253"/>
         <source>Speed</source>
         <translation>Ātrums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="270"/>
+        <location filename="../qt-ui/preferences.ui" line="280"/>
         <source>Subsurface Webservice</source>
         <translation>Subsurface tīmekļa serviss</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>Lietotāja ID pēc noklusējama</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>Saglabāt lietotāja ID lokāli?</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="312"/>
+        <source>Reset all settings to their default value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
         <source>System</source>
         <translation>Sistēma</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="348"/>
         <source>Metric</source>
         <translation>Metrisks</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="333"/>
+        <location filename="../qt-ui/preferences.ui" line="358"/>
         <source>Imperial</source>
         <translation>Imperiāls</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="343"/>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
         <source>Personalize</source>
         <translation>Personalizēt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="392"/>
         <source>Depth</source>
         <translation>Dziļums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="374"/>
+        <location filename="../qt-ui/preferences.ui" line="399"/>
         <source>meter</source>
         <translation>metrs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="409"/>
         <source>feet</source>
         <translation>pēda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="401"/>
+        <location filename="../qt-ui/preferences.ui" line="426"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="411"/>
+        <location filename="../qt-ui/preferences.ui" line="436"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="428"/>
+        <location filename="../qt-ui/preferences.ui" line="453"/>
         <source>liter</source>
         <translation>litrs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="438"/>
+        <location filename="../qt-ui/preferences.ui" line="463"/>
         <source>cu ft</source>
         <translation>kub. pēda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="455"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>celsius</source>
         <translation>celsija</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="465"/>
+        <location filename="../qt-ui/preferences.ui" line="490"/>
         <source>fahrenheit</source>
         <translation>fārenheita</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="482"/>
+        <location filename="../qt-ui/preferences.ui" line="507"/>
         <source>kg</source>
         <translation>kg</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>sliekšņu vērtība pO₂</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>sliekšņu vērtība pN₂</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>sliekšņu vērtība pHe</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="636"/>
-        <source>max ppO₂ when showing MOD</source>
-        <translation>maks ppO₂ parādot MOD</translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="811"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="817"/>
+        <source>Proxy type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="830"/>
+        <source>Host</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="856"/>
+        <source>Port</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="882"/>
+        <source>Requires authentication</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="657"/>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="925"/>
+        <source>Password</source>
+        <translation>Parole</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="682"/>
         <source>draw dive computer reported ceiling red</source>
         <translation>attēlot niršanas datora paziņoto maks. dekompr. pieturu ar sarkano</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="747"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>System Default</source>
         <translation>Sistēmas noklusējama iestādīšana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="767"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>Filter</source>
         <translation>Filtrs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="419"/>
         <source>Pressure</source>
         <translation>Spiediens</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="421"/>
+        <location filename="../qt-ui/preferences.ui" line="446"/>
         <source>Volume</source>
         <translation>Tilpums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="448"/>
+        <location filename="../qt-ui/preferences.ui" line="473"/>
         <source>Temperature</source>
         <translation>Temperatūra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="475"/>
+        <location filename="../qt-ui/preferences.ui" line="500"/>
         <source>Weight</source>
         <translation>Svars</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="517"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="507"/>
+        <location filename="../qt-ui/preferences.ui" line="532"/>
         <source>Time units</source>
         <translation>Laika mērvienības</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>Pacelšanas/nolaišanas ātruma saucējs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="520"/>
+        <location filename="../qt-ui/preferences.ui" line="545"/>
         <source>Minutes</source>
         <translation>Minūtes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="530"/>
+        <location filename="../qt-ui/preferences.ui" line="555"/>
         <source>Seconds</source>
         <translation>Sekundes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="562"/>
+        <location filename="../qt-ui/preferences.ui" line="587"/>
         <source>Show</source>
         <translation>Parādīt</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="693"/>
         <source>Show non-used cylinders in Equipment Tab</source>
         <translation>Parādīt neizmantotus balonus iekārtas cilnē</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>parādīt vidējo dziļumu</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>GFLow maks. dziļumā</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="691"/>
+        <location filename="../qt-ui/preferences.ui" line="716"/>
         <source>Misc</source>
         <translation>Dažāds</translation>
     </message>
@@ -2075,35 +2228,65 @@ Lūdzu, sākumā likvidējiet tos.</translation>
         <translation>Priekšrocības</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="697"/>
+        <location filename="../qt-ui/preferences.ui" line="722"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="739"/>
         <source>GFHigh</source>
         <translation>GFHigh</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="24"/>
+        <source>System proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="25"/>
+        <source>HTTP proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="26"/>
+        <source>SOCKS proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="245"/>
         <source>Restart required</source>
         <translation>Ir nepieciešams restarts</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>Lai pareizi atspoguļotu jaunu valodu Jums jārestartē Subsurface.</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>Atvērt noklusējamo žurnalēšanas datni</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>Subsurface XML datnes (*.ssrf *.xml *.XML)</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="394"/>
+        <source>Warning</source>
+        <translation>Brīdinājums</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"/>
+    </message>
 </context>
 <context>
     <name>PrintDialog</name>
@@ -2244,72 +2427,72 @@ Lūdzu, sākumā likvidējiet tos.</translation>
 <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>nezināms</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>Niršana #%1 - %2</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>Maks. dziļums: %1 %2</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>Ilgums: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1918"/>
+        <location filename="../qt-ui/models.cpp" line="1898"/>
         <source>Gas Used:</source>
         <translation>Lietojama gāze:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1920"/>
+        <location filename="../qt-ui/models.cpp" line="1900"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1922"/>
+        <location filename="../qt-ui/models.cpp" line="1902"/>
         <source>Max. CNS:</source>
         <translation>Max. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1924"/>
+        <location filename="../qt-ui/models.cpp" line="1904"/>
         <source>Weights:</source>
         <translation>Krava:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1929"/>
+        <location filename="../qt-ui/models.cpp" line="1909"/>
         <source>Notes:</source>
         <translation>Piezīmes:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1936"/>
+        <location filename="../qt-ui/models.cpp" line="1916"/>
         <source>Divemaster:</source>
         <translation>Niršanas speciālists:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1938"/>
+        <location filename="../qt-ui/models.cpp" line="1918"/>
         <source>Buddy:</source>
         <translation>Draugs:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1940"/>
+        <location filename="../qt-ui/models.cpp" line="1920"/>
         <source>Suit:</source>
         <translation>Kostīms:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1942"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>Viz:</source>
         <translation>Redz.:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1944"/>
+        <location filename="../qt-ui/models.cpp" line="1924"/>
         <source>Rating:</source>
         <translation>Novērtējums:</translation>
     </message>
@@ -2317,62 +2500,77 @@ Lūdzu, sākumā likvidējiet tos.</translation>
 <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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/>
+        <source>Make first divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="906"/>
+        <source>Delete this divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="913"/>
         <source>Add Gas Change</source>
         <translation>Pievienot gāzes maiņu</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>Pievienot grāmatzīmi</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>Noņemt notikumu</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>Paslēpt līdzīgus notikumus</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>Rediģēt vārdu</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>Parādīt visus notikumus</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>Paslēpt notikumus</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>Paslēpt visus %1 notikumus?</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>Nodzēst izvēlēto notikumu?</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>%1 @ %2:%3</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>Rediģēt grāmatzīmes vārdu</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>Vārds:</translation>
     </message>
@@ -2380,12 +2578,12 @@ Lūdzu, sākumā likvidējiet tos.</translation>
 <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>Gaisa</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>Noņemt šo vietu</translation>
     </message>
@@ -2395,22 +2593,22 @@ Lūdzu, sākumā likvidējiet tos.</translation>
         <translation>Aizvērt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="34"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation>Vidējais</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="37"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation>Minimums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="40"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation>Maksimums</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>Pārvietojiet karti un klikšķiet divreiz, lai atzīmētu niršanas vietu</translation>
     </message>
@@ -2424,9 +2622,23 @@ Lūdzu, sākumā likvidējiet tos.</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="128"/>
         <source>New starting number</source>
         <translation>Jauns sākuma skaitlis</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="126"/>
+        <source>New number</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchBar</name>
+    <message>
+        <location filename="../qt-ui/searchbar.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ShiftImageTimesDialog</name>
@@ -2441,42 +2653,47 @@ Lūdzu, sākumā likvidējiet tos.</translation>
         <translation>Nobīdīt attēls(-u) laikus uz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="102"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="95"/>
+        <source>h:mm</source>
+        <translation>h:mm</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="105"/>
         <source>earlier</source>
         <translation>agrāk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="109"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="112"/>
         <source>later</source>
         <translation>vēlāk</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>Lai izskaitļotu laika nobīdi starp niršanas datora un kameras, nofotagrafējiet niršanas datora displeju ar tekošo laiku. Lejupielādējiet attēlu datorā un nospiediet šo pogu.</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>Noteikit kameras laika nobīdi</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>Izvēlēt attēlu ar niršanas datoru, kurš parāda laiku</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>Kurš datums un laiks ir attēlots?</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>Atvērt attēla failu</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>Attēlu faili (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2556,42 +2773,42 @@ Lūdzu, sākumā likvidējiet tos.</translation>
 <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>Tīmekļserviss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/>
         <source>Connecting...</source>
         <translation>Pieslēdzas...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="421"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="419"/>
         <source>Download finished</source>
         <translation>Lajupielādēšana pabeigta</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>Lejupielādēšanas kļūda: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/>
         <source>Connection Error: </source>
         <translation>Savienojuma Kļūda:</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>Nepareizs lietotāja identifikators!</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>Nevar saparsēt atbildi!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/>
         <source>Download Success!</source>
         <translation>Lejupielādēšana ir sekmīga!</translation>
     </message>
@@ -2607,17 +2824,17 @@ Lūdzu, sākumā likvidējiet tos.</translation>
 <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>Apraksts</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2625,7 +2842,7 @@ Lūdzu, sākumā likvidējiet tos.</translation>
 <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>Informācija</translation>
     </message>
@@ -2633,42 +2850,42 @@ Lūdzu, sākumā likvidējiet tos.</translation>
 <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>Pārbaudīt atjaunāšanas.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="37"/>
-        <source>&lt;h3&gt;Subsurface was unable to check for updates.&lt;/h3&gt;</source>
-        <translation>&lt;h3&gt;Subsurface&apos;am neizdevas pārbaudīt atjaunāšanas.&lt;/h3&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="36"/>
+        <source>Subsurface was unable to check for updates.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
-        <source>&lt;br/&gt;&lt;b&gt;The following error occurred:&lt;/b&gt;&lt;br/&gt;</source>
-        <translation>&lt;br/&gt;&lt;b&gt;Sekojoša kļūda gadījas:&lt;/b&gt;&lt;br/&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="41"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="43"/>
-        <source>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Please check your internet connection.&lt;/b&gt;</source>
-        <translation>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Lūdzu, pārbaudiet interneta pieslēgšanu.&lt;/b&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
     </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>Jūs izmantojat aktuālako Subsurface versiju.</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>Jauna Subsurface versija ir pieejama.&lt;br/&gt;Noklikšķiet šeit:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt;, lai to lejupielādētu.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="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>&lt;b&gt;Ir pieejama jauna Subsurface versija.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</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>Gadījas kļūda pārbaudot atjaunāšanas.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -2676,25 +2893,163 @@ Lūdzu, sākumā likvidējiet tos.</translation>
 <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>Lietotāja rokasgrāmata</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>Nevar atrast Subsurface rokasgrāmatu</translation>
     </message>
 </context>
 <context>
+    <name>UserSurvey</name>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="47"/>
+        <source>Subsurface User Survey</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="79"/>
+        <source>Recreational DIver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="92"/>
+        <source>Tech Diver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="105"/>
+        <source>Interested in dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="118"/>
+        <source>I am downloading dives from supported dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="131"/>
+        <source>I am importing dives from other software / sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="144"/>
+        <source>I am manually entering dives</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="190"/>
+        <source>Please type suggestions (in English) in the following box</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="27"/>
+        <source>
+Operating System: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="30"/>
+        <source>
+CPU Architecture: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="35"/>
+        <source>
+OS CPU Architecture %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="39"/>
+        <source>
+Language: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="73"/>
+        <source>Should we ask you later?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="74"/>
+        <source>Don&apos;t ask me again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="75"/>
+        <source>Ask Later</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="76"/>
+        <source>Ask again?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <source>Submit User Survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <source>Subsurface was unable to submit the user survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="101"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="102"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="111"/>
+        <source>Survey successfully submitted.</source>
+        <translation type="unfinished"/>
+    </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>Gadījas kļūda pārbaudot atjaunāšanas.&lt;br/&gt;&lt;br/&gt;%1</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>Apraksts</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="723"/>
+        <location filename="../qt-ui/models.cpp" line="721"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2742,12 +3097,12 @@ Lūdzu, sākumā likvidējiet tos.</translation>
         <translation>Augšupielādēt</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>Procesa izpilīdšanas laiks pārsniedza robežus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="279"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="277"/>
         <source>Transfering data...</source>
         <translation>Datu pārvietošana...</translation>
     </message>
@@ -2755,37 +3110,37 @@ Lūdzu, sākumā likvidējiet tos.</translation>
 <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>Tips</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="368"/>
+        <location filename="../qt-ui/models.cpp" line="373"/>
         <source>Weight</source>
         <translation>Svars</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>Noklikšķot šeit Jūs noņemsiet svara sistēmu.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="453"/>
+        <location filename="../qt-ui/models.cpp" line="458"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="454"/>
+        <location filename="../qt-ui/models.cpp" line="459"/>
         <source>lbs</source>
         <translation>mārciņa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="478"/>
+        <location filename="../qt-ui/models.cpp" line="483"/>
         <source>ft</source>
         <translation>pēda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="484"/>
         <source>m</source>
         <translation>m</translation>
     </message>
@@ -2793,79 +3148,79 @@ Lūdzu, sākumā likvidējiet tos.</translation>
 <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>Gads
 &gt; Mēnesis / Ceļojums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1643"/>
         <source>Duration 
  Total</source>
         <translation>Ilgums
 Kopā</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>
 Average</source>
         <translation>
 Vidējais</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>
 Shortest</source>
         <translation>
 Īsakais</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>
 Longest</source>
         <translation>
 Garākais</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>Dziļums (%1)
 Vidējais</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>
 Minimums</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>
 Maksimums</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>SAC (%1)
 Vidējais</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>Temp. (%1)
@@ -2875,99 +3230,92 @@ Vidējais</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="58"/>
+        <location filename="../dive.c" line="87"/>
         <source>pascal</source>
         <translation>paskāls</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>bar</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>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="104"/>
-        <location filename="../qt-gui.cpp" line="292"/>
-        <source>l</source>
-        <translation>l</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>cuft</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>m</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>ft</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>lbs</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>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1120"/>
+        <location filename="../dive.c" line="1237"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) vai (%s)</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>gaiss</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="170"/>
+        <location filename="../equipment.c" line="210"/>
         <source>integrated</source>
         <translation>integrēts</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="171"/>
+        <location filename="../equipment.c" line="211"/>
         <source>belt</source>
         <translation>josta</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="172"/>
+        <location filename="../equipment.c" line="212"/>
         <source>ankle</source>
         <translation>svars uz kājām</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="173"/>
+        <location filename="../equipment.c" line="213"/>
         <source>backplate weight</source>
         <translation>svars uz plātni</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="174"/>
+        <location filename="../equipment.c" line="214"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -2984,253 +3332,253 @@ Vidējais</translation>
         <translation>Maksimālais atbalstītais stabu skaits CSV importēšanai ir %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>none</source>
         <translation>neviens</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>deco stop</source>
         <translation>deko pietura</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ascent</source>
         <translation>stāvums</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ceiling</source>
         <translation>maksimāla dekompr. pietura</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>workload</source>
         <translation>darba slodze</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>transmitter</source>
         <translation>raidītājs</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>violation</source>
         <translation>pārkapšana</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>bookmark</source>
         <translation>grāmatzīme</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>surface</source>
         <translation>virsma</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>safety stop</source>
         <translation>drošības pietura</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>gāzes maiņa</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (voluntary)</source>
         <translation>drošības pietura (brīvprātīga)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (mandatory)</source>
         <translation>drošības pietura (obligāta)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>deepstop</source>
         <translation>dziļa pietura</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>ceiling (safety stop)</source>
         <translation>maksimāla dekompr. pietura (drošības pietura)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>divetime</source>
         <translation>niršanas laiks</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>zemāk par grīdu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>maxdepth</source>
         <translation>maks. dziļums</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>PO2</source>
         <translation>PO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>airtime</source>
         <translation>skābekļa laiks</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>heading</source>
         <translation>virziens</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>tissue level warning</source>
         <translation>audu līmeņa brīdinājums</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>non stop time</source>
         <translation>bes apstāšanas laiks</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="163"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>invalid event number</source>
         <translation>kļūdains notikuma numurs</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>Nav iespējams izveidot parsētāju priekš %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="411"/>
+        <location filename="../libdivecomputer.c" line="414"/>
         <source>Error registering the data</source>
         <translation>Kļūda reģistrējot datus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="419"/>
+        <location filename="../libdivecomputer.c" line="422"/>
         <source>Error parsing the datetime</source>
         <translation>Kļūda parsējot laiku</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="438"/>
         <source>Dive %d: %s %d %04d</source>
         <translation>Niršana %d: %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="440"/>
+        <location filename="../libdivecomputer.c" line="443"/>
         <source>Error parsing the divetime</source>
         <translation>Kļūda parsējot niršanas laiku</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="449"/>
+        <location filename="../libdivecomputer.c" line="452"/>
         <source>Error parsing the maxdepth</source>
         <translation>Kļūda parsējot maks. dziļumu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="458"/>
+        <location filename="../libdivecomputer.c" line="461"/>
         <source>Error parsing the gas mix count</source>
         <translation>Kļūda parsējot gāzes maisījuma daudzumu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="470"/>
+        <location filename="../libdivecomputer.c" line="473"/>
         <source>Error obtaining water salinity</source>
         <translation>Kļūda ūdens sāļuma noteikšanā</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error obtaining surface pressure</source>
         <translation>Kļūda spiediena noteikšanā uz virsmu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the gas mix</source>
         <translation>Kļūda parsējot gāzes maisījumu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="493"/>
+        <location filename="../libdivecomputer.c" line="496"/>
         <source>Error parsing the samples</source>
         <translation>Kļūda parsējot paraugus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="623"/>
+        <location filename="../libdivecomputer.c" line="626"/>
         <source>Event: waiting for user action</source>
         <translation>Notikums: gaida lietotāja darbību</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>modelis=%u (0x%08x), aparātprogrammatūra=%u (0x%08x), serial numurs=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="691"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the event handler.</source>
         <translation>Kļūda reģistrējot notikumu apstrādātāju.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="696"/>
+        <location filename="../libdivecomputer.c" line="699"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Error registering the cancellation handler.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="717"/>
+        <location filename="../libdivecomputer.c" line="720"/>
         <source>Dive data import error</source>
         <translation>Kļūda importējot niršanas datus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="756"/>
+        <location filename="../libdivecomputer.c" line="759"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Nav iespējams izveidot libdivecomputer kontekstu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="763"/>
+        <location filename="../libdivecomputer.c" line="766"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Nevar atvērt %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="462"/>
+        <location filename="../parse-xml.c" line="466"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Dīvaina procentu nolasīšana %s
 </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>Kļūme parsējot &apos;%s&apos;</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>Kļūme datubāzes vaicājumā get_events.
 </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>Neizdevas datubāzes pieprasījums get_tags.
@@ -3244,111 +3592,160 @@ Vidējais</translation>
 </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 '%s'.
 </source>
         <translation>Kļūme vaicājot datubāzi &apos;@s&apos;.
 </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>Neizdevas datubāzes pieprasījums get_cylinders.
 </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>Neizdevas datubāzes pieprasījums get_changes.
 </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>Neizdevas datubāzes pieprasījums get_profile_sample.
 </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>Nevar atvērts stila lapu %s</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>EAN</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="146"/>
-        <location filename="../planner.c" line="617"/>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation>Nevar atrast gāzi %d/%d</translation>
+        <location filename="../planner.c" line="159"/>
+        <location filename="../planner.c" line="752"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="308"/>
+        <location filename="../planner.c" line="345"/>
         <source>Too many gas mixes</source>
         <translation>Parāk daudz gāzes maisījumu</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="489"/>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation>%s
-Subsurface niršanas plāns
-pamatojoties uz GFlow = %.0f un GFhigh = %.0f
-
-</translation>
+        <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"/>
     </message>
     <message>
-        <location filename="../planner.c" line="530"/>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Pāreja uz %.*f %s pēc %d:%02d min - izpildlaiks %d:%02u ar maisījumu %s
-</translation>
+        <location filename="../planner.c" line="535"/>
+        <source>based on GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="539"/>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Apturēties uz %.*f %s uz %d:%02d min - izpildlaiks %d:%02u uz maisījuma %s
-</translation>
+        <location filename="../planner.c" line="538"/>
+        <source>Subsurface dive plan</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="550"/>
-        <source>Switch gas to %s
-</source>
-        <translation>Pārslēgt gāzi uz %s
-</translation>
+        <location filename="../planner.c" line="542"/>
+        <source>depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="558"/>
-        <source>Gas consumption:
-</source>
-        <translation>Gāzes patērēšana:
-</translation>
+        <location filename="../planner.c" line="545"/>
+        <source>runtime</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="569"/>
-        <source>%.0f%s of %s
-</source>
-        <translation>%.0f%s no %s
-</translation>
+        <location filename="../planner.c" line="548"/>
+        <source>duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="551"/>
+        <source>gas</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="606"/>
+        <source>%3.0f%s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="810"/>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
+        <source>%3dmin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="629"/>
+        <source>Switch gas to %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="638"/>
+        <source>Gas consumption:</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="659"/>
+        <source>this is more gas than available in the specified cylinder!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="664"/>
+        <source>not enough reserve for gas sharing on ascent!</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="668"/>
+        <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="980"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1226"/>
+        <location filename="../profile.c" line="1250"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3357,70 +3754,69 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1229"/>
+        <location filename="../profile.c" line="1253"/>
         <source>P: %d%s
 </source>
         <translation>S: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1233"/>
+        <location filename="../profile.c" line="1257"/>
         <source>T: %.1f%s
 </source>
         <translation>L: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1263"/>
         <source>V: %.1f%s
 </source>
         <translation>Ā: %.1f%s
 </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>SAC: %2.1fl/min
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1244"/>
+        <location filename="../profile.c" line="1268"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1246"/>
+        <location filename="../profile.c" line="1270"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1272"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="1274"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="1277"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1260"/>
+        <location filename="../profile.c" line="1284"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3429,7 +3825,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1264"/>
+        <location filename="../profile.c" line="1288"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3438,402 +3834,395 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1276"/>
+        <location filename="../profile.c" line="1300"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Drošības apstāšana: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1279"/>
+        <location filename="../profile.c" line="1303"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Drošības apstāšana: nez. laiks @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="1308"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Dekompr.: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
+        <location filename="../profile.c" line="1311"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Dekompr.: nez. laiks @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1291"/>
+        <location filename="../profile.c" line="1315"/>
         <source>In deco
 </source>
         <translation>Dekompresijā
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1293"/>
+        <location filename="../profile.c" line="1317"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1297"/>
+        <location filename="../profile.c" line="1321"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Dekompr.: %umin @ %.0f%s (izrēķ.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1305"/>
+        <location filename="../profile.c" line="1329"/>
         <source>In deco (calc)
 </source>
         <translation>Dekompresijā (izrēķ.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1307"/>
+        <location filename="../profile.c" line="1331"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (izrēķ.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1310"/>
+        <location filename="../profile.c" line="1334"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (izrēķ.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1313"/>
+        <location filename="../profile.c" line="1337"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Aprēķināta maks. dekompr. pietura %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1319"/>
+        <location filename="../profile.c" line="1343"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Audu līmenis %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1325"/>
+        <location filename="../profile.c" line="1349"/>
         <source>heartbeat: %d
 </source>
         <translation>sirdspuksti: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1327"/>
+        <location filename="../profile.c" line="1351"/>
         <source>bearing: %d
 </source>
         <translation>azimuts: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1419"/>
+        <location filename="../profile.c" line="1443"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</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>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1435"/>
+        <location filename="../profile.c" line="1459"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1439"/>
+        <location filename="../profile.c" line="1463"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</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>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1454"/>
+        <location filename="../profile.c" line="1478"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="273"/>
+        <location filename="../qt-gui.cpp" line="281"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="276"/>
+        <location filename="../qt-gui.cpp" line="284"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="392"/>
-        <source>%1, %2 %3, %4 %5:%6</source>
-        <translation>%1, %2 %3, %4 %5:%6</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="405"/>
-        <source>%1 %2, %3
-%4:%5</source>
-        <translation>%1 %2, %3
-%4:%5</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="418"/>
+        <location filename="../qt-gui.cpp" line="417"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 niršanas)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="423"/>
+        <location filename="../qt-gui.cpp" line="422"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 niršana)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>boat</source>
         <translation>kuģis</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>shore</source>
         <translation>krasts</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>drift</source>
         <translation>straume</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>deep</source>
         <translation>dziļums</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>cavern</source>
         <translation>ala</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>ice</source>
         <translation>ledus</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>wreck</source>
         <translation>šķembas</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>cave</source>
         <translation>ala</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>altitude</source>
         <translation>augstiene</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>pool</source>
         <translation>baseins</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>lake</source>
         <translation>ezers</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>river</source>
         <translation>upe</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>night</source>
         <translation>nakts</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>fresh</source>
         <translation>svaigs</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>student</source>
         <translation>students</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>photo</source>
         <translation>foto</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>video</source>
         <translation>video</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>instructor</source>
         <translation>instruktors</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="25"/>
         <source>deco</source>
         <translation>dekompr.</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="216"/>
+        <location filename="../dive.c" line="133"/>
+        <source>ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="214"/>
         <source>more than %d days</source>
         <translation>vairāk nekā %d dienas</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="220"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dst %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="224"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dh %dmin</source>
         <translation>%dst %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="235"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation>priekš niršanas #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="242"/>
+        <location filename="../statistics.c" line="240"/>
         <source>for selected dives</source>
         <translation>priekš izvēlētām niršanām</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="275"/>
         <source>for dive #%d</source>
         <translation>priekš niršanas #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for selected dive</source>
         <translation>priekš izvēlētai niršanai</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for all dives</source>
         <translation>priekš visām niršanām</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="283"/>
+        <location filename="../statistics.c" line="281"/>
         <source>(no dives)</source>
         <translation>(nav niršanas)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sun</source>
         <translation>Svēt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Mon</source>
         <translation>Pirm</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Tue</source>
         <translation>Otr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Wed</source>
         <translation>Treš</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Thu</source>
         <translation>Cet</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Fri</source>
         <translation>Piekt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sat</source>
         <translation>Sest</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>May</source>
         <translation>Maijs</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jun</source>
         <translation>Jūn</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Jul</source>
         <translation>Jūl</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Dec</source>
         <translation>Dec</translation>
     </message>
@@ -3863,97 +4252,97 @@ Is the Uemis Zurich plugged in correctly?</source>
 Vai Uemis Zurich ir pareizi pieslēgts?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="107"/>
+        <location filename="../uemis-downloader.c" line="111"/>
         <source>unknown</source>
         <translation>nezināms</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="379"/>
+        <location filename="../uemis-downloader.c" line="383"/>
         <source>Reading %s %s</source>
         <translation>Nolasa %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="399"/>
+        <location filename="../uemis-downloader.c" line="403"/>
         <source>data</source>
         <translation>dati</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="420"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>divelog entry id</source>
         <translation>žurnāla pieraksta ID</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="422"/>
+        <location filename="../uemis-downloader.c" line="426"/>
         <source>divespot data id</source>
         <translation>niršanas vietas ID</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
+        <location filename="../uemis-downloader.c" line="428"/>
         <source>more data dive id</source>
         <translation>Niršanas papilddatu ID</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>wetsuit</source>
         <translation>Slapjš kostīms</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>semidry</source>
         <translation>pussauss</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>drysuit</source>
         <translation>Sauss kostīms</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>shorty</source>
         <translation>īss</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>vest</source>
         <translation>veste</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>long john</source>
         <translation>kombinezons</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>jacket</source>
         <translation>jaka</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>full suit</source>
         <translation>Pilns kostīms</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>2 pcs full suit</source>
         <translation>2-daļu kostīms</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="620"/>
+        <location filename="../uemis-downloader.c" line="624"/>
         <source>membrane</source>
         <translation>membrāna</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="802"/>
+        <location filename="../uemis-downloader.c" line="823"/>
         <source>Init Communication</source>
         <translation>Sakaru inicializēšana</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="804"/>
+        <location filename="../uemis-downloader.c" line="825"/>
         <source>Uemis init failed</source>
         <translation>Kļūme inicializējot Uemis</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="815"/>
+        <location filename="../uemis-downloader.c" line="836"/>
         <source>Start download</source>
         <translation>Uzsākt lejupielādi</translation>
     </message>
@@ -3974,18 +4363,18 @@ Vai Uemis Zurich ir pareizi pieslēgts?</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="203"/>
-        <source>PO2 Green Warning</source>
-        <translation>Brīdinājums: PO₂ zaļš</translation>
+        <source>pO₂ Green Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
-        <source>PO2 Ascend Warning</source>
-        <translation>Brīdinājums: PO₂ pacelšanas laikā</translation>
+        <source>pO₂ Ascend Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="208"/>
-        <source>PO2 Ascend Alarm</source>
-        <translation>Trauksme: PO₂ pacelšanas laikā</translation>
+        <source>pO₂ Ascend Alarm</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
@@ -4047,5 +4436,214 @@ Vai Uemis Zurich ir pareizi pieslēgts?</translation>
         <source>Low Battery Alert</source>
         <translation>Trauksme: mazs baterijas lādiņš</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"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="36"/>
+        <source>Date:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="38"/>
+        <source>Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="40"/>
+        <source>Duration:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="41"/>
+        <source>min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="43"/>
+        <source>Max Depth:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="46"/>
+        <source>Air Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="48"/>
+        <source>Water Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="50"/>
+        <source>Location:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="54"/>
+        <source>Notes:</source>
+        <translation>Piezīmes:</translation>
+    </message>
+</context>
+<context>
+    <name>plannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="35"/>
+        <source>Rates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="56"/>
+        <source>Ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="77"/>
+        <source>below 75% avg. depth</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="94"/>
+        <source>75%-50% avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="111"/>
+        <source>50% avg. depth - 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="128"/>
+        <source>6m/20ft to surface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="148"/>
+        <source>Descent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="200"/>
+        <source>surface to the bottom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="226"/>
+        <source>Planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="247"/>
+        <source>GF low</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="264"/>
+        <source>GF high</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
+        <source>Drop to first depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
+        <source>Last Stop at 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>plan backgas breaks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="318"/>
+        <source>Gas Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <source>bottom SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="349"/>
+        <source>deco SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="359"/>
+        <source>bottom pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="389"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="382"/>
+        <source>deco pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="421"/>
+        <source>Dive Notes</source>
+        <translation>Niršanas piezīmes</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="445"/>
+        <source>display runtime</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="458"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="461"/>
+        <source>display segment duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="471"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="474"/>
+        <source>display transitions in deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="481"/>
+        <source>verbatim diveplan</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts
index 33a5fc4bd..d9f13b43e 100644
--- a/translations/subsurface_nb_NO.ts
+++ b/translations/subsurface_nb_NO.ts
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="nb_NO" version="2.0">
+<defaultcodec>UTF-8</defaultcodec>
 <context>
     <name>CylindersModel</name>
     <message>
@@ -37,42 +38,42 @@
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="71"/>
+        <location filename="../qt-ui/models.cpp" line="70"/>
         <source>Switch at</source>
         <translation>Gassbytte ved</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>Klikk her for å fjerne denne flaska.</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>Flaska kan ikke fjernes</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>Denne gassen er i bruk. Du kan bare fjerne flasker som ikke er i bruk.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="507"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="508"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="527"/>
+        <location filename="../qt-ui/models.cpp" line="532"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="528"/>
+        <location filename="../qt-ui/models.cpp" line="533"/>
         <source>cuft</source>
         <translation>ft³</translation>
     </message>
@@ -99,22 +100,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>Modell</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Device ID</source>
         <translation>Enhets-ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Nickname</source>
         <translation>Navn</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>Klikk her for å fjerne denne computeren.</translation>
     </message>
@@ -122,190 +123,326 @@
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="90"/>
-        <source>air</source>
-        <translation>luft</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="92"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</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>Bytter til OC</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> start</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> slutt</translation>
     </message>
 </context>
 <context>
-    <name>DiveGasPressureItem</name>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="475"/>
-        <source>air</source>
-        <translation>luft</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="476"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-</context>
-<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1258"/>
-        <source> l/min</source>
-        <translation>l/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
-        <source> cuft/min</source>
-        <translation>ft³/min</translation>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <source>/min</source>
+        <translation>/min</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>Vis søkeboks</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="706"/>
         <source>expand all</source>
         <translation>vis alle turer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="740"/>
+        <location filename="../qt-ui/divelistview.cpp" line="707"/>
         <source>collapse all</source>
         <translation>slå sammen alle turer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="741"/>
+        <location filename="../qt-ui/divelistview.cpp" line="708"/>
         <source>collapse others</source>
         <translation>slå sammen andre turer</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>fjern dykk fra tur</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>legg til ny tur over denne</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>legg dykk til turen over</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>legg dykk til turen under denne</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>slå sammen tur med turen over</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>slå sammen tur med turen under</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>slett dykk</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>merk dykk som skjult</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
-        <source>save As</source>
-        <translation>lagre som</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="763"/>
-        <source>export As UDDF</source>
-        <translation>eksporter som UDDF</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="764"/>
-        <source>export As CSV</source>
-        <translation>eksporter som CSV</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="744"/>
+        <source>renumber dive(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="765"/>
+        <location filename="../qt-ui/divelistview.cpp" line="745"/>
         <source>shift times</source>
         <translation>forskyvning av tidspunkter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="766"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>load images</source>
         <translation>last inn bilder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="769"/>
-        <source>upload dive(s) to divelogs.de</source>
-        <translation>last opp til divelogs.de</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Open Image Files</source>
+        <translation>Åpne bildefiler</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation>Bildefiler (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <source>merge selected dives</source>
+        <translation>slå sammen valgte dykk</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="24"/>
+        <source>General Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="30"/>
+        <source>Export format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="42"/>
+        <source>Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="61"/>
+        <source>UDDF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="74"/>
+        <source>divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="84"/>
+        <source>CSV</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="94"/>
+        <source>Worldmap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="107"/>
+        <source>Selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="116"/>
+        <source>Selected dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="126"/>
+        <source>All dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="178"/>
+        <source>HTML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="184"/>
+        <source>General Settings</source>
+        <translation>Generelle innstillinger</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="190"/>
+        <source>Subsurface Numbers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="203"/>
+        <source>Selected Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="216"/>
+        <source>Minimum Javascript</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="229"/>
+        <source>All Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="239"/>
+        <source>Export List only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="252"/>
+        <source>Style Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="264"/>
+        <source>Font</source>
+        <translation>Skrifttype</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="274"/>
+        <source>Font size</source>
+        <translation>Skriftstørrelse</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
+        <source>8</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <source>10</source>
+        <translation>10</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <source>12</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <source>14</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <source>16</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <source>18</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="795"/>
-        <source>Save Dives As...</source>
-        <translation>Lagre dykk som...</translation>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <source>20</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="814"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="323"/>
+        <source>Theme</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <source>Sand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="153"/>
         <source>Export UDDF File as</source>
         <translation>Eksporter UDDF-fil som</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>UDDF-filer (*.uddf *.UDDF)</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>Eksporter CSV-fil som</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>CSV-filer (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Open Image Files</source>
-        <translation>Åpne bildefiler</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="162"/>
+        <source>Export World Map</source>
+        <translation>Eksporter verdenskart</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
-        <translation>Bildefiler (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="163"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="177"/>
+        <source>HTML files (*.html)</source>
+        <translation>HTML-filer (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="760"/>
-        <source>merge selected dives</source>
-        <translation>slå sammen valgte dykk</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="167"/>
+        <source>Export Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="168"/>
+        <source>XML files (*.xml *.ssrf)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="176"/>
+        <source>Export HTML files as</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -316,138 +453,133 @@
         <translation>Importer dykkelogg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="36"/>
-        <source>Import CSV Dive Log Files</source>
-        <translation>Importer dykkelogg fra CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="50"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
         <source>CSV options</source>
         <translation>CSV-valg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="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>Feltseparator</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>Prekonfigurerte importer</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>Feltkonfigurasjon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="80"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="100"/>
         <source>Stopdepth</source>
         <translation>Stoppdybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="107"/>
         <source>PO2</source>
         <translation>pO₂</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>Tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="121"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="151"/>
         <source>Cns</source>
         <translation>CNS</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>Enheter</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>Metrisk</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>Britiske mål</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="248"/>
         <source>Manual dives</source>
         <translation>Manuelle dykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="283"/>
         <source>Dive #</source>
         <translation>Dykk #</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="317"/>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="385"/>
         <source>Duration</source>
         <translation>Varighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="470"/>
         <source>Tags</source>
         <translation>Emner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
         <source>Location</source>
         <translation>Sted</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="453"/>
         <source>Gps</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="300"/>
         <source>Max depth</source>
         <translation>Maksdybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="334"/>
         <source>Mean depth</source>
         <translation>Snittdybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="368"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="402"/>
         <source>Notes</source>
         <translation>Notater</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="436"/>
         <source>Weight</source>
         <translation>Vekt</translation>
     </message>
@@ -455,105 +587,70 @@
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="71"/>
-        <source>Bottom SAC</source>
-        <translation>SAC på bunn</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="85"/>
-        <source>SAC on DECO Stop</source>
-        <translation>SAC under deko</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="78"/>
-        <source>GFHigh</source>
-        <translation>GF høy</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="98"/>
-        <source>GFLow</source>
-        <translation>GF lav</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="125"/>
-        <source>Last Stop at 6m</source>
-        <translation>Siste stopp på 6m</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="106"/>
+        <source>Planned Dive Time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="174"/>
-        <source>Start Time</source>
-        <translation>Starttid</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="134"/>
+        <source>Altitude</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="181"/>
+        <location filename="../qt-ui/diveplanner.ui" line="141"/>
         <source>ATM Pressure</source>
         <translation>Atmosfæretrykk</translation>
     </message>
-</context>
-<context>
-    <name>DivePlannerGraphics</name>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="114"/>
-        <source>10m</source>
-        <translation>10m</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="116"/>
-        <source>30ft</source>
-        <translation>30ft</translation>
-    </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="363"/>
-        <source>Handler Position Error</source>
-        <translation>Handler Position-feil</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="148"/>
+        <source>mbar</source>
+        <translation type="unfinished"/>
     </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>
-        <translation>En eller flere av stoppene dine vil bli tapt hvis du fortsetter.
-Fjern dem før du gjør dette.</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="158"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="445"/>
-        <source>AIR</source>
-        <translation>Luft</translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="137"/>
+        <source>unknown</source>
+        <translation>ukjent</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1148"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="586"/>
         <source>Final Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1150"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="588"/>
         <source>Run time</source>
         <translation>Løpetid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1152"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="590"/>
         <source>Duration</source>
         <translation>Varighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1154"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="592"/>
         <source>Used Gas</source>
         <translation>Gass</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>CC setpoint</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>Forkaste planen?</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>Du er i ferd med å forkaste planen.</translation>
     </message>
@@ -561,17 +658,17 @@ Fjern dem før du gjør dette.</translation>
 <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>Punkter i dykkeplan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="256"/>
         <source>Available Gases</source>
         <translation>Tilgjengelige gasser</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>legg til datapunkt</translation>
     </message>
@@ -615,8 +712,23 @@ Fjern dem før du gjør dette.</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
-        <source>Pressure  S</source>
-        <translation>Trykk S</translation>
+        <source>Pressure S</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <source>pN₂</source>
+        <translation>pN₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>pHe</source>
+        <translation>pHe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
@@ -633,86 +745,71 @@ Fjern dem før du gjør dette.</translation>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
-        <source>PN2</source>
-        <translation>pN₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
-        <source>PHE</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
-        <source>PO2</source>
-        <translation>pO₂</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>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>date</source>
         <translation>dato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1298"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>lbs</source>
         <translation>pund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
+        <location filename="../qt-ui/models.cpp" line="1307"/>
         <source>suit</source>
         <translation>drakt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1310"/>
         <source>cyl</source>
         <translation>flaske</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1344"/>
+        <location filename="../qt-ui/models.cpp" line="1325"/>
         <source>location</source>
         <translation>sted</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1316"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1338"/>
+        <location filename="../qt-ui/models.cpp" line="1319"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1341"/>
+        <location filename="../qt-ui/models.cpp" line="1322"/>
         <source>maxCNS</source>
         <translation>maks CNS</translation>
     </message>
@@ -720,115 +817,115 @@ Fjern dem før du gjør dette.</translation>
 <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>Ugyldig svar fra tjener</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>Forventet XML-tag &apos;DiveDateReader&apos;, men fikk &apos;%1</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>Fant ikke XML-tag &apos;DiveDates&apos; som forventet</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>Feil formattert XML-svar. Linje %1: %2</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>ingen dykk valgt</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>klarte ikke å lage zipfil for opplasting: %s</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>klarte ikke å lage midlertidig fil: %s</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>intern feil: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="181"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="179"/>
         <source>internal error</source>
         <translation>intern feil</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>Ferdig</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>Laster opp liste over dykk...</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>Laster ned liste over dykk...</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>Laster ned %1 dykk...</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>Nedlasting er ferdig - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
         <source>Corrupted download</source>
         <translation>Nedlastingen er skadet</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>Arkivet kunne ikke åpnes:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Upload failed</source>
         <translation>Opplasting feilet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="849"/>
         <source>Upload successful</source>
         <translation>Ferdig å laste opp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="854"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="852"/>
         <source>Login failed</source>
         <translation>Innlogging feilet</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>Kan ikke lese svar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="868"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Error: %1</source>
         <translation>Feil: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="835"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/>
         <source>Upload finished</source>
         <translation>Opplasting er ferdig</translation>
     </message>
@@ -836,54 +933,54 @@ Fjern dem før du gjør dette.</translation>
 <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>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="165"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/>
         <source>Error</source>
         <translation>Feil</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>Prøv igjen</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>Finn Uemis dykkecomputer</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>Velg fil som loggfil for dykkecomputer</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>Loggfiler (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="339"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
         <source>Warning</source>
         <translation>Advarsel</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>Lagring av dump fra libdivecomputer vil IKKE laste ned dykk til dykkeloggen.</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>Velg fil som binærdump fra dykkecomputer</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>Dumpfiler (*.bin)</translation>
     </message>
@@ -951,7 +1048,7 @@ Fjern dem før du gjør dette.</translation>
 <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>Rediger valgte steder</translation>
     </message>
@@ -960,848 +1057,854 @@ Fjern dem før du gjør dette.</translation>
     <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>Dykk</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>Sted</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="148"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Coordinates</source>
         <translation>Koordinater</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="169"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
         <source>Divemaster</source>
         <translation>Dykkeleder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="155"/>
+        <location filename="../qt-ui/maintab.ui" line="148"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="63"/>
-        <source>Start time</source>
-        <translation>Starttid</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>Lufttemp.</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>Vanntemp.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="127"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Tags</source>
         <translation>Emner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="223"/>
         <source>Rating</source>
         <translation>Vurdering</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="236"/>
         <source>Visibility</source>
         <translation>Sikt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="215"/>
+        <location filename="../qt-ui/maintab.ui" line="127"/>
         <source>Suit</source>
         <translation>Drakt</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>Notater</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="270"/>
+        <location filename="../qt-ui/maintab.ui" line="311"/>
         <source>Equipment</source>
         <translation>Utstyr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="350"/>
+        <location filename="../qt-ui/maintab.ui" line="391"/>
         <source>Dive Info</source>
         <translation>Informasjon</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>Dato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="414"/>
+        <location filename="../qt-ui/maintab.ui" line="275"/>
+        <source>Time</source>
+        <translation>Tid</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="455"/>
         <source>Interval</source>
         <translation>Intervall</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="433"/>
+        <location filename="../qt-ui/maintab.ui" line="474"/>
         <source>Gases Used</source>
         <translation>Gasser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="452"/>
+        <location filename="../qt-ui/maintab.ui" line="493"/>
         <source>Gas Consumed</source>
         <translation>Gasskonsum</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>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="531"/>
         <source>Max. Depth</source>
         <translation>Maksdybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="509"/>
+        <location filename="../qt-ui/maintab.ui" line="550"/>
         <source>Ave. Depth</source>
         <translation>Snittdybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="528"/>
+        <location filename="../qt-ui/maintab.ui" line="569"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="547"/>
+        <location filename="../qt-ui/maintab.ui" line="588"/>
         <source>Air Pressure</source>
         <translation>Lufttrykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="566"/>
+        <location filename="../qt-ui/maintab.ui" line="607"/>
         <source>Air Temperature</source>
         <translation>Lufttemperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="585"/>
+        <location filename="../qt-ui/maintab.ui" line="626"/>
         <source>Water Temperature</source>
         <translation>Vanntemperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="604"/>
+        <location filename="../qt-ui/maintab.ui" line="645"/>
         <source>Dive Time</source>
         <translation>Dykketid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="623"/>
+        <location filename="../qt-ui/maintab.ui" line="664"/>
         <source>Salinity</source>
         <translation>Saltholdighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="660"/>
+        <location filename="../qt-ui/maintab.ui" line="701"/>
         <source>Stats</source>
         <translation>Statistikk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="746"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="784"/>
         <source>Duration</source>
         <translation>Varighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Total Time</source>
         <translation>Total tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="835"/>
         <source>Dives</source>
         <translation>Dykk</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="919"/>
+        <source>Photos</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="89"/>
         <source>Cylinders</source>
         <translation>Flasker</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="90"/>
         <source>Add Cylinder</source>
         <translation>Legg til flaske</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="93"/>
         <source>Weights</source>
         <translation>Vekter</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>Legg til vektsystem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="438"/>
+        <location filename="../qt-ui/maintab.cpp" line="409"/>
         <source>Trip Location</source>
         <translation>Tursted</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>Turnotater</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="42"/>
+        <location filename="../qt-ui/maintab.cpp" line="48"/>
         <source>Save</source>
         <translation>Lagre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="46"/>
+        <location filename="../qt-ui/maintab.cpp" line="52"/>
         <source>Cancel</source>
         <translation>Avbryt</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>Lufttemp. [%1]</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>Vanntemp. [%1]</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>Denne turen redigeres.</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>Flere dykk redigeres.</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>Dette dykket redigeres.</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>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="494"/>
+        <location filename="../qt-ui/maintab.cpp" line="464"/>
         <source>unknown</source>
         <translation>ukjent</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>N</source>
-        <translation>N</translation>
+        <location filename="../qt-ui/maintab.cpp" line="501"/>
+        <source>Deepest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>S</source>
-        <translation>S</translation>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <source>Shallowest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>E</source>
-        <translation>Ø</translation>
+        <location filename="../qt-ui/maintab.cpp" line="794"/>
+        <source>Discard the Changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>W</source>
-        <translation>V</translation>
+        <location filename="../qt-ui/maintab.cpp" line="795"/>
+        <source>You are about to discard your changes.</source>
+        <translation type="unfinished"/>
     </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>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="571"/>
+        <location filename="../qt-ui/mainwindow.ui" line="646"/>
         <source>&amp;File</source>
         <translation>&amp;Fil</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="583"/>
+        <source>Print</source>
+        <translation>Skriv ut</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:'Courier'; 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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
         <source>&amp;Log</source>
         <translation>&amp;Logg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="606"/>
+        <location filename="../qt-ui/mainwindow.ui" line="679"/>
         <source>&amp;View</source>
         <translation>&amp;Vis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="628"/>
+        <location filename="../qt-ui/mainwindow.ui" line="701"/>
         <source>&amp;Help</source>
         <translation>&amp;Hjelp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="636"/>
+        <location filename="../qt-ui/mainwindow.ui" line="709"/>
         <source>&amp;Import</source>
         <translation>&amp;Importer</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>&amp;Ny loggbok</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="655"/>
+        <location filename="../qt-ui/mainwindow.ui" line="728"/>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="658"/>
+        <location filename="../qt-ui/mainwindow.ui" line="731"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</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>Åpne l&amp;oggbok</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="666"/>
+        <location filename="../qt-ui/mainwindow.ui" line="739"/>
         <source>Open</source>
         <translation>Åpne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <location filename="../qt-ui/mainwindow.ui" line="742"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="674"/>
+        <location filename="../qt-ui/mainwindow.ui" line="747"/>
         <source>&amp;Save</source>
         <translation>Lagre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="677"/>
+        <location filename="../qt-ui/mainwindow.ui" line="750"/>
         <source>Save</source>
         <translation>Lagre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="680"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>Save as</source>
         <translation>Lagre som</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>Ctrl+Shift+S</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>Lukk</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Close</source>
         <translation>Lukk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="702"/>
+        <location filename="../qt-ui/mainwindow.ui" line="775"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="902"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <source>P&amp;references</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="831"/>
+        <source>&amp;Add Dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <source>Auto &amp;Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="863"/>
+        <source>&amp;Dive List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="871"/>
+        <source>&amp;Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="879"/>
+        <source>&amp;Info</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="887"/>
+        <source>&amp;All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="895"/>
+        <source>P&amp;rev DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="903"/>
+        <source>&amp;Next DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="911"/>
+        <source>&amp;Select Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <source>&amp;About Subsurface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="937"/>
+        <source>&amp;Globe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="953"/>
+        <source>&amp;Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="959"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="707"/>
-        <source>Export &amp;UDDF</source>
-        <translation>Eksporter &amp;UDDF</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="1008"/>
+        <source>&amp;Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1011"/>
+        <source>Export Dive Logs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1014"/>
+        <source>Ctrl+E</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Enable the pN2 Graph</source>
         <translation>Skru på pN₂-graf</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <location filename="../qt-ui/mainwindow.ui" line="128"/>
         <source>Enable the pHe graph</source>
         <translation>Skru på pHe-graf</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <location filename="../qt-ui/mainwindow.ui" line="290"/>
         <source>Show/hide heart rate</source>
         <translation>Vis/skjul puls</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <location filename="../qt-ui/mainwindow.ui" line="342"/>
         <source>Enable EAD, END, and EADD</source>
         <translation>Skru på EAD, END og EADD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="238"/>
         <source>Show NDL / TTS</source>
         <translation>Vis NDL / TTS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="456"/>
+        <location filename="../qt-ui/mainwindow.ui" line="394"/>
         <source>Rescale depth axis</source>
         <translation>Skaler dybdeakse på nytt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="710"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="715"/>
-        <source>Export HTML World Map</source>
-        <translation>Eksport verdenskart som HTML</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="718"/>
-        <source>Ctrl+H</source>
-        <translation>Ctrl+H</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="723"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>&amp;Print</source>
         <translation>Skriv ut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="734"/>
+        <location filename="../qt-ui/mainwindow.ui" line="791"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="742"/>
+        <location filename="../qt-ui/mainwindow.ui" line="799"/>
         <source>&amp;Quit</source>
         <translation>Avslutt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="753"/>
+        <location filename="../qt-ui/mainwindow.ui" line="810"/>
         <source>Import from &amp;dive computer</source>
         <translation>Importer fra &amp;dykkecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="818"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation>Importer &amp;GPS-data fra Subsurface-tjenesten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="764"/>
+        <location filename="../qt-ui/mainwindow.ui" line="821"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="826"/>
         <source>&amp;Edit Device Names</source>
         <translation>Rediger &amp;enhetsnavn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="834"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="782"/>
+        <location filename="../qt-ui/mainwindow.ui" line="839"/>
         <source>&amp;Renumber</source>
         <translation>Nummere&amp;r på nytt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="785"/>
+        <location filename="../qt-ui/mainwindow.ui" line="842"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="798"/>
+        <location filename="../qt-ui/mainwindow.ui" line="855"/>
         <source>&amp;Yearly Statistics</source>
         <translation>Årlig statistikk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="801"/>
+        <location filename="../qt-ui/mainwindow.ui" line="858"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="806"/>
-        <source>Dive List</source>
-        <translation>Liste over dykk</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="814"/>
-        <source>Profile</source>
-        <translation>Profil</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="822"/>
-        <source>Info</source>
-        <translation>Info</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="830"/>
-        <source>All</source>
-        <translation>Alle</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="872"/>
+        <location filename="../qt-ui/mainwindow.ui" line="929"/>
         <source>User &amp;Manual</source>
         <translation>Bruker&amp;manual</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="880"/>
-        <source>Globe</source>
-        <translation>Globus</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="888"/>
+        <location filename="../qt-ui/mainwindow.ui" line="945"/>
         <source>P&amp;lan Dive</source>
         <translation>P&amp;lanlegg dykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="891"/>
+        <location filename="../qt-ui/mainwindow.ui" line="948"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="907"/>
-        <source>Import from Divelogs.de</source>
-        <translation>Importer fra divelogs.de</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1003"/>
         <source>&amp;Check for Updates</source>
         <translation>Sjekk for oppdateringer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="951"/>
-        <source>Export CSV</source>
-        <translation>Eksporter CSVq</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="726"/>
+        <location filename="../qt-ui/mainwindow.ui" line="783"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</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>Skru på pO₂-graf</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>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="316"/>
         <source>Enable MOD</source>
         <translation>Skru på MOD</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>Vis tak fra computer</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>Vis kalkulert tak</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>Vis kalkulert tak med tremetersintervaller</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>Regn ut alle vev</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>Vis SAC-rate</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>Skru på/av linjalen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="731"/>
-        <source>Preferences</source>
-        <translation>Valg</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="745"/>
+        <location filename="../qt-ui/mainwindow.ui" line="802"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="756"/>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="774"/>
-        <source>Add Dive</source>
-        <translation>Nytt dyk</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="793"/>
-        <source>Auto Group</source>
-        <translation>Autogruppering</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="809"/>
+        <location filename="../qt-ui/mainwindow.ui" line="866"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="817"/>
+        <location filename="../qt-ui/mainwindow.ui" line="874"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <location filename="../qt-ui/mainwindow.ui" line="882"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="833"/>
+        <location filename="../qt-ui/mainwindow.ui" line="890"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="838"/>
-        <source>Prev DC</source>
-        <translation>Forrige DC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="841"/>
+        <location filename="../qt-ui/mainwindow.ui" line="898"/>
         <source>Left</source>
         <translation>Venstre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="846"/>
-        <source>Next DC</source>
-        <translation>Neste DC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="849"/>
+        <location filename="../qt-ui/mainwindow.ui" line="906"/>
         <source>Right</source>
         <translation>Høyre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="854"/>
-        <source>Select Events</source>
-        <translation>Velg hendelser</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <location filename="../qt-ui/mainwindow.ui" line="916"/>
         <source>Input Plan</source>
         <translation>Legg inn plan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="864"/>
-        <source>About Subsurface</source>
-        <translation>Om Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="875"/>
+        <location filename="../qt-ui/mainwindow.ui" line="932"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="883"/>
+        <location filename="../qt-ui/mainwindow.ui" line="940"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="896"/>
-        <source>Import Log Files</source>
-        <translation>Importer loggfiler</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="899"/>
+        <location filename="../qt-ui/mainwindow.ui" line="956"/>
         <source>Import divelog files from other applications</source>
         <translation>Importer dykkelogg fra andre programmer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="915"/>
+        <location filename="../qt-ui/mainwindow.ui" line="964"/>
+        <source>Import &amp;from Divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="972"/>
         <source>&amp;Full Screen</source>
         <translation>&amp;Fullskjerm</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>Fullskjerm av/på</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <location filename="../qt-ui/mainwindow.ui" line="978"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="174"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
         <source>Open File</source>
         <translation>Åpne fil</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>Lagre eller avbryt redigeringen før du lukker fila.</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>
-        <translation>Lagre eller avbryt redigeringa før du planlegger et dykk.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="396"/>
+        <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>Lagre eller avbryt redigeringa før du legger til et nytt dykk.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="645"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="419"/>
+        <source>Print runtime table</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="710"/>
         <source>Do you want to save the changes you made in the file %1?</source>
         <translation>Vil du lagre endringene i %1?</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>Vil du lagre endringene?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="652"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="717"/>
         <source>Save Changes?</source>
         <translation>Lagre endringer?</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>Endringer vil gå tapt hvis du ikke lagrer.</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>Lagre som</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>Advarsel</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>Lagre eller avbryt redigeringa før du åpner en ny fil.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="280"/>
-        <source>Export UDDF File as</source>
-        <translation>Eksporter UDDF-fil som</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="281"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>UDDF-filer (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="289"/>
-        <source>Export CSV File as</source>
-        <translation>Eksporter CSV-fil som</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="290"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>CSV-filer (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="299"/>
-        <source>Export World Map</source>
-        <translation>Eksporter verdenskart</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="300"/>
-        <source>HTML files (*.html)</source>
-        <translation>HTML-filer (*.html)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="449"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="514"/>
         <source>Yearly Statistics</source>
         <translation>Årsstatistikk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="961"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1076"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML-filer (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1199"/>
         <source>Open Dive Log File</source>
         <translation>Åpne dykkelogg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <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>Dykkeloggfiler (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML-filer (*.xml);;UDDF/UDCF-filer (*.uddf *.udcf);;JDiveLog-filer (*.jlb);;Suunto-filer (*.sde *.db);;CSV-filer (*.csv);;Alle filer (*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1225"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Avslutt denne redigeringa før du starter en ny.</translation>
     </message>
 </context>
 <context>
+    <name>PlannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Last stop at 20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="416"/>
+        <source>Last stop at 6m</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>PreferencesDialog</name>
     <message>
         <location filename="../qt-ui/preferences.ui" line="85"/>
@@ -1824,247 +1927,297 @@ Fjern dem før du gjør dette.</translation>
         <translation>Språk</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="151"/>
         <source>Lists and Tables</source>
         <translation>Lister og tabeller</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font</source>
         <translation>Skrifttype</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="167"/>
         <source>Font size</source>
         <translation>Skriftstørrelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="170"/>
+        <location filename="../qt-ui/preferences.ui" line="180"/>
         <source>Dives</source>
         <translation>Dykk</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>Standard dykkelogg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="188"/>
+        <location filename="../qt-ui/preferences.ui" line="198"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="197"/>
+        <location filename="../qt-ui/preferences.ui" line="207"/>
         <source>Display Invalid</source>
         <translation>Vis skjulte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="214"/>
+        <location filename="../qt-ui/preferences.ui" line="224"/>
         <source>Default Cylinder</source>
         <translation>Standardflaske</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>Bruk standardflaske</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <location filename="../qt-ui/preferences.ui" line="247"/>
         <source>Animations</source>
         <translation>Animasjoner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <location filename="../qt-ui/preferences.ui" line="253"/>
         <source>Speed</source>
         <translation>Hastighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="270"/>
+        <location filename="../qt-ui/preferences.ui" line="280"/>
         <source>Subsurface Webservice</source>
         <translation>Subsurface webservice</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>Bruker-ID</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>Lagre bruker-ID lokalt?</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="312"/>
+        <source>Reset all settings to their default value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="348"/>
         <source>Metric</source>
         <translation>Metrisk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="333"/>
+        <location filename="../qt-ui/preferences.ui" line="358"/>
         <source>Imperial</source>
         <translation>Britiske mål</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="343"/>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
         <source>Personalize</source>
         <translation>Personaliser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="392"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="374"/>
+        <location filename="../qt-ui/preferences.ui" line="399"/>
         <source>meter</source>
         <translation>meter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="409"/>
         <source>feet</source>
         <translation>fot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="401"/>
+        <location filename="../qt-ui/preferences.ui" line="426"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="411"/>
+        <location filename="../qt-ui/preferences.ui" line="436"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="428"/>
+        <location filename="../qt-ui/preferences.ui" line="453"/>
         <source>liter</source>
         <translation>liter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="438"/>
+        <location filename="../qt-ui/preferences.ui" line="463"/>
         <source>cu ft</source>
         <translation>ft³</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="455"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="465"/>
+        <location filename="../qt-ui/preferences.ui" line="490"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="482"/>
+        <location filename="../qt-ui/preferences.ui" line="507"/>
         <source>kg</source>
         <translation>kg</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>terskel for visning av pO₂</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>terskel for visning av pN₂</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>terskel for visning av pHe</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="636"/>
-        <source>max ppO₂ when showing MOD</source>
-        <translation>maks ppO₂ ved visning av MOD</translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="811"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="817"/>
+        <source>Proxy type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="830"/>
+        <source>Host</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="856"/>
+        <source>Port</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="882"/>
+        <source>Requires authentication</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="925"/>
+        <source>Password</source>
+        <translation>Passord</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>vis tak fra dykkecomputer i rødt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="747"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>System Default</source>
         <translation>Standard for system</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="767"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="419"/>
         <source>Pressure</source>
         <translation>Trykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="421"/>
+        <location filename="../qt-ui/preferences.ui" line="446"/>
         <source>Volume</source>
         <translation>Volum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="448"/>
+        <location filename="../qt-ui/preferences.ui" line="473"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="475"/>
+        <location filename="../qt-ui/preferences.ui" line="500"/>
         <source>Weight</source>
         <translation>Vekt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="517"/>
         <source>lbs</source>
         <translation>pund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="507"/>
+        <location filename="../qt-ui/preferences.ui" line="532"/>
         <source>Time units</source>
         <translation>Tidsenheter</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>Enhet for opp-/nedstigningshastighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="520"/>
+        <location filename="../qt-ui/preferences.ui" line="545"/>
         <source>Minutes</source>
         <translation>Minutter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="530"/>
+        <location filename="../qt-ui/preferences.ui" line="555"/>
         <source>Seconds</source>
         <translation>Sekunder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="562"/>
+        <location filename="../qt-ui/preferences.ui" line="587"/>
         <source>Show</source>
         <translation>Vis</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="693"/>
         <source>Show non-used cylinders in Equipment Tab</source>
         <translation>Vis ubrukte flasker i utstyrsfanen</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>vis snittdybde</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>GF lav ved maksdybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="691"/>
+        <location filename="../qt-ui/preferences.ui" line="716"/>
         <source>Misc</source>
         <translation>Ymse</translation>
     </message>
@@ -2074,35 +2227,65 @@ Fjern dem før du gjør dette.</translation>
         <translation>Valg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="697"/>
+        <location filename="../qt-ui/preferences.ui" line="722"/>
         <source>GFLow</source>
         <translation>GF lav</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="739"/>
         <source>GFHigh</source>
         <translation>GF høy</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="24"/>
+        <source>System proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="25"/>
+        <source>HTTP proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="26"/>
+        <source>SOCKS proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="245"/>
         <source>Restart required</source>
         <translation>Programmet må startes på nytt</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>For å bytte språk må du starte Subsurface på nytt.</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>Åpne standardlogg</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>Subsurface XML-filer (*.ssrf *.xml *.XML)</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="394"/>
+        <source>Warning</source>
+        <translation>Advarsel</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"/>
+    </message>
 </context>
 <context>
     <name>PrintDialog</name>
@@ -2243,72 +2426,72 @@ Fjern dem før du gjør dette.</translation>
 <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>ukjent</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>Dykk nr. %1- %2</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>Max dybde: %1 %2</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>Varighet: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1918"/>
+        <location filename="../qt-ui/models.cpp" line="1898"/>
         <source>Gas Used:</source>
         <translation>Gass brukt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1920"/>
+        <location filename="../qt-ui/models.cpp" line="1900"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1922"/>
+        <location filename="../qt-ui/models.cpp" line="1902"/>
         <source>Max. CNS:</source>
         <translation>Mac. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1924"/>
+        <location filename="../qt-ui/models.cpp" line="1904"/>
         <source>Weights:</source>
         <translation>Vekter:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1929"/>
+        <location filename="../qt-ui/models.cpp" line="1909"/>
         <source>Notes:</source>
         <translation>Notater:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1936"/>
+        <location filename="../qt-ui/models.cpp" line="1916"/>
         <source>Divemaster:</source>
         <translation>Dykkeleder:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1938"/>
+        <location filename="../qt-ui/models.cpp" line="1918"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1940"/>
+        <location filename="../qt-ui/models.cpp" line="1920"/>
         <source>Suit:</source>
         <translation>Drakt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1942"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>Viz:</source>
         <translation>Sikt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1944"/>
+        <location filename="../qt-ui/models.cpp" line="1924"/>
         <source>Rating:</source>
         <translation>Vurdering:</translation>
     </message>
@@ -2316,62 +2499,77 @@ Fjern dem før du gjør dette.</translation>
 <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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/>
+        <source>Make first divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="906"/>
+        <source>Delete this divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="913"/>
         <source>Add Gas Change</source>
         <translation>Legg til gassbytte</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>Legg til bokmerke</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>Fjern hendelse</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>Skjul lignende hendelser</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>Rediger navn</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>Vis alle hendelser</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>Skjul hendelser</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>Skjul alle %1 hendelser?</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>Fjern den valgte hendelsen?</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>%1 @ %2:%3</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>Rediger navn på bokmerke</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>Tilpasset navn:</translation>
     </message>
@@ -2379,12 +2577,12 @@ Fjern dem før du gjør dette.</translation>
 <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>Luft</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>Fjern dette punktet</translation>
     </message>
@@ -2394,22 +2592,22 @@ Fjern dem før du gjør dette.</translation>
         <translation>Lukk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="34"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation>Gjennomsnitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="37"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="40"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation>Maksimum</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>Finn sted i kartet og dobbeltklikk for å sette posisjon</translation>
     </message>
@@ -2423,9 +2621,23 @@ Fjern dem før du gjør dette.</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="128"/>
         <source>New starting number</source>
         <translation>Nytt startnummer</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="126"/>
+        <source>New number</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchBar</name>
+    <message>
+        <location filename="../qt-ui/searchbar.ui" line="14"/>
+        <source>Form</source>
+        <translation>Skjema</translation>
+    </message>
 </context>
 <context>
     <name>ShiftImageTimesDialog</name>
@@ -2440,42 +2652,47 @@ Fjern dem før du gjør dette.</translation>
         <translation>Flytt tidspunkter fra bilder med</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="102"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="95"/>
+        <source>h:mm</source>
+        <translation>h:mm</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="105"/>
         <source>earlier</source>
         <translation>tidligere</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="109"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="112"/>
         <source>later</source>
         <translation>senere</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>For å regne ut forskjelleg mellom klokkene på dykkecomputeren din og kameraet ditt, bruk kameraet for å ta et bilde av computeren mens den viser klokka.  Last ned dette bildet til datamaskina di og trykk denne knappen.</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>Finn ut tidsforskjell til kamera</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>Velg bilde av dykkecomputeren som viser klokka</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>Hvilket dato og tid vises på bildet?</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>Åpne bildefil</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>Bildefiler (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2555,42 +2772,42 @@ Fjern dem før du gjør dette.</translation>
 <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>Nettjeneste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/>
         <source>Connecting...</source>
         <translation>Kobler til...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="421"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="419"/>
         <source>Download finished</source>
         <translation>Nedlasting er ferdig</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>Feil ved nedlasting: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/>
         <source>Connection Error: </source>
         <translation>Feil med forbindelse</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>Ugyldig bruker-ID!</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>Kan ikke lese svar!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/>
         <source>Download Success!</source>
         <translation>Ferdig å laste ned</translation>
     </message>
@@ -2606,17 +2823,17 @@ Fjern dem før du gjør dette.</translation>
 <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>Beskrivelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2624,7 +2841,7 @@ Fjern dem før du gjør dette.</translation>
 <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>Informasjon</translation>
     </message>
@@ -2632,42 +2849,42 @@ Fjern dem før du gjør dette.</translation>
 <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>Se etter oppdateringer.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="37"/>
-        <source>&lt;h3&gt;Subsurface was unable to check for updates.&lt;/h3&gt;</source>
-        <translation>&lt;h3&gt;Subsurface klarte ikke å se etter oppdateringer.&lt;/h3&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="36"/>
+        <source>Subsurface was unable to check for updates.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
-        <source>&lt;br/&gt;&lt;b&gt;The following error occurred:&lt;/b&gt;&lt;br/&gt;</source>
-        <translation>&lt;br/&gt;&lt;b&gt;Følgende feil oppstod:&lt;/b&gt;&lt;br/&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="41"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="43"/>
-        <source>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Please check your internet connection.&lt;/b&gt;</source>
-        <translation>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Sjekk internettforbindelsen din.&lt;/b&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
     </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>Du bruker den siste versjonen av Subsurface.</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>En ny versjon av Subsurface er tilgjengelig.&lt;br/&gt;Klikk på:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; for å laste ned.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="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>&lt;b&gt;En ny versjon av Subsurface er tilgjengelig.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</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>Det oppstod en feil under leting etter oppdatering.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -2675,25 +2892,163 @@ Fjern dem før du gjør dette.</translation>
 <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>Brukermanual</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>Finner ikke manualen</translation>
     </message>
 </context>
 <context>
+    <name>UserSurvey</name>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>Dialogboks</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="47"/>
+        <source>Subsurface User Survey</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="79"/>
+        <source>Recreational DIver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="92"/>
+        <source>Tech Diver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="105"/>
+        <source>Interested in dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="118"/>
+        <source>I am downloading dives from supported dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="131"/>
+        <source>I am importing dives from other software / sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="144"/>
+        <source>I am manually entering dives</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="190"/>
+        <source>Please type suggestions (in English) in the following box</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="27"/>
+        <source>
+Operating System: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="30"/>
+        <source>
+CPU Architecture: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="35"/>
+        <source>
+OS CPU Architecture %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="39"/>
+        <source>
+Language: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="73"/>
+        <source>Should we ask you later?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="74"/>
+        <source>Don&apos;t ask me again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="75"/>
+        <source>Ask Later</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="76"/>
+        <source>Ask again?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <source>Submit User Survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <source>Subsurface was unable to submit the user survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="101"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="102"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="111"/>
+        <source>Survey successfully submitted.</source>
+        <translation type="unfinished"/>
+    </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>Det oppstod en feil under leting etter oppdatering.&lt;br/&gt;&lt;br/&gt;%1</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>Beskrivelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="723"/>
+        <location filename="../qt-ui/models.cpp" line="721"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2741,12 +3096,12 @@ Fjern dem før du gjør dette.</translation>
         <translation>Last opp</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>Handlingen fikk tidsavbrudd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="279"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="277"/>
         <source>Transfering data...</source>
         <translation>Overfører data...</translation>
     </message>
@@ -2754,37 +3109,37 @@ Fjern dem før du gjør dette.</translation>
 <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</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="368"/>
+        <location filename="../qt-ui/models.cpp" line="373"/>
         <source>Weight</source>
         <translation>Vekt</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>Klikk her for å fjerne dette vektsystemet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="453"/>
+        <location filename="../qt-ui/models.cpp" line="458"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="454"/>
+        <location filename="../qt-ui/models.cpp" line="459"/>
         <source>lbs</source>
         <translation>pund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="478"/>
+        <location filename="../qt-ui/models.cpp" line="483"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="484"/>
         <source>m</source>
         <translation>m</translation>
     </message>
@@ -2792,79 +3147,79 @@ Fjern dem før du gjør dette.</translation>
 <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>År
 &gt; Måned / Tur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1643"/>
         <source>Duration 
  Total</source>
         <translation>Varighet
 Total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>
 Average</source>
         <translation>
 Snitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>
 Shortest</source>
         <translation>
 Kortest</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>
 Longest</source>
         <translation>
 Lengst</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>Dybde (%1)
 Snitt</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>
 Minimum</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>
 Maksimum</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>SAC (%1)
 Snitt</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>Temp. (%1)
@@ -2874,99 +3229,92 @@ Snitt</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="58"/>
+        <location filename="../dive.c" line="87"/>
         <source>pascal</source>
         <translation>pascal</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>bar</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>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="104"/>
-        <location filename="../qt-gui.cpp" line="292"/>
-        <source>l</source>
-        <translation>l</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>ft³</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>m</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>ft</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>pund</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>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1120"/>
+        <location filename="../dive.c" line="1237"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) eller (%s)</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>luft</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="170"/>
+        <location filename="../equipment.c" line="210"/>
         <source>integrated</source>
         <translation>integrert bly</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="171"/>
+        <location filename="../equipment.c" line="211"/>
         <source>belt</source>
         <translation>vektbelte</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="172"/>
+        <location filename="../equipment.c" line="212"/>
         <source>ankle</source>
         <translation>ankelvekt</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="173"/>
+        <location filename="../equipment.c" line="213"/>
         <source>backplate weight</source>
         <translation>p-vekt</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="174"/>
+        <location filename="../equipment.c" line="214"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -2983,253 +3331,253 @@ Snitt</translation>
         <translation>Maks antall kolonner i CSV-importen er %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>none</source>
         <translation>ingen</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>deco stop</source>
         <translation>dekostopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ascent</source>
         <translation>oppstigning</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ceiling</source>
         <translation>tak</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>workload</source>
         <translation>arbeidsbelastning</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>transmitter</source>
         <translation>sender</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>violation</source>
         <translation>brudd</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>bookmark</source>
         <translation>bokmerke</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>surface</source>
         <translation>overflate</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>safety stop</source>
         <translation>sikkerhetsstopp</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>gassbytte</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (voluntary)</source>
         <translation>sikkerhetsstopp (frivillig)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (mandatory)</source>
         <translation>sikkerhetsstopp (obligatorisk)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>deepstop</source>
         <translation>dypstopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>ceiling (safety stop)</source>
         <translation>tak (sikkerhetsstopp)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>divetime</source>
         <translation>dykketid</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>under tak</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>maxdepth</source>
         <translation>maksdybde</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>PO2</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>airtime</source>
         <translation>lufttid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>heading</source>
         <translation>retning</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>tissue level warning</source>
         <translation>Advarsel: nivå i vev</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>non stop time</source>
         <translation>tid uten stopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="163"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>invalid event number</source>
         <translation>ugyldig hendelsesnummer</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>Kunne ikke lage parser for %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="411"/>
+        <location filename="../libdivecomputer.c" line="414"/>
         <source>Error registering the data</source>
         <translation>Feil ved registrering av data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="419"/>
+        <location filename="../libdivecomputer.c" line="422"/>
         <source>Error parsing the datetime</source>
         <translation>Feil ved lesing av dato</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="438"/>
         <source>Dive %d: %s %d %04d</source>
         <translation>Dykk %d: %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="440"/>
+        <location filename="../libdivecomputer.c" line="443"/>
         <source>Error parsing the divetime</source>
         <translation>Feil ved lesing av dykketid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="449"/>
+        <location filename="../libdivecomputer.c" line="452"/>
         <source>Error parsing the maxdepth</source>
         <translation>Feil ved lesing av maksdybde</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="458"/>
+        <location filename="../libdivecomputer.c" line="461"/>
         <source>Error parsing the gas mix count</source>
         <translation>Feil ved lesing av gassmiksantall</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="470"/>
+        <location filename="../libdivecomputer.c" line="473"/>
         <source>Error obtaining water salinity</source>
         <translation>Feil ved lesing av salthetsgrad</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error obtaining surface pressure</source>
         <translation>Klarte ikke å hente overflatetrykk</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the gas mix</source>
         <translation>Feil ved lesing av gassmiks</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="493"/>
+        <location filename="../libdivecomputer.c" line="496"/>
         <source>Error parsing the samples</source>
         <translation>Feil ved lesing av detaljer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="623"/>
+        <location filename="../libdivecomputer.c" line="626"/>
         <source>Event: waiting for user action</source>
         <translation>Hendelse: Venter på bruker</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>modell=%u (0x%08x), firmware=%u (0x%08x), serienr=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="691"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the event handler.</source>
         <translation>Feil ved registrering av hendelseshåndterer.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="696"/>
+        <location filename="../libdivecomputer.c" line="699"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Feil ved registrering av avbruddshåndterer.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="717"/>
+        <location filename="../libdivecomputer.c" line="720"/>
         <source>Dive data import error</source>
         <translation>Feil ved import av dykkedata</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="756"/>
+        <location filename="../libdivecomputer.c" line="759"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Kunne ikke opprette kontekst for libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="763"/>
+        <location filename="../libdivecomputer.c" line="766"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Fikk ikke åpnet %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="462"/>
+        <location filename="../parse-xml.c" line="466"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Rar lesing av prosent %s
 </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>Kunne ikke lese &apos;%s&apos;</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>Databasespørring get_events feilet.
 </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>Databasespørring get_tags feilet.
@@ -3243,111 +3591,160 @@ Snitt</translation>
 </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 '%s'.
 </source>
         <translation>Databasespørring feilet &apos;%s&apos;.
 </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>Databasespørring get_cylinders feilet.
 </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>Databasespørring get_changes feilet.
 </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>Databasespørring get_profile_sample feilet.
 </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>Kan ikke åpne stilark %s</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>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="146"/>
-        <location filename="../planner.c" line="617"/>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation>Finner ikke gassen %d/%d</translation>
+        <location filename="../planner.c" line="159"/>
+        <location filename="../planner.c" line="752"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="308"/>
+        <location filename="../planner.c" line="345"/>
         <source>Too many gas mixes</source>
         <translation>For mange gassmikser</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="489"/>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation>%s
-Subsurface dykkeplan
-basert på GF lav = %.0f og GF høy = %.0f
-
-</translation>
+        <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>Advarsel! Dette er en ny implementasjon av Bühlmann-algoritmen, og en dykkeplanlegger som ikke har blitt testet noe særlig.  Vi anbefaler på det sterkeste å ikke planlegge dykk utelukkende med data herfra.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="530"/>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Overgang til %.*f %s i %d:%02d min - kjøretid %d:%02u på %s
-</translation>
+        <location filename="../planner.c" line="535"/>
+        <source>based on GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="539"/>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Bli ved %.*f %s i %d:%02d min - kjøretid %d:%02u på %s
-</translation>
+        <location filename="../planner.c" line="538"/>
+        <source>Subsurface dive plan</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="550"/>
-        <source>Switch gas to %s
-</source>
-        <translation>Bytt gass til %s
-</translation>
+        <location filename="../planner.c" line="542"/>
+        <source>depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="558"/>
-        <source>Gas consumption:
-</source>
-        <translation>Gasskonsum:
-</translation>
+        <location filename="../planner.c" line="545"/>
+        <source>runtime</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="569"/>
-        <source>%.0f%s of %s
-</source>
-        <translation>%.0f%s på %s
-</translation>
+        <location filename="../planner.c" line="548"/>
+        <source>duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="551"/>
+        <source>gas</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </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"/>
     </message>
     <message>
-        <location filename="../planner.c" line="810"/>
+        <location filename="../planner.c" line="606"/>
+        <source>%3.0f%s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
+        <source>%3dmin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="629"/>
+        <source>Switch gas to %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="638"/>
+        <source>Gas consumption:</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="659"/>
+        <source>this is more gas than available in the specified cylinder!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="664"/>
+        <source>not enough reserve for gas sharing on ascent!</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="668"/>
+        <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="980"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1226"/>
+        <location filename="../profile.c" line="1250"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3356,70 +3753,69 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1229"/>
+        <location filename="../profile.c" line="1253"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1233"/>
+        <location filename="../profile.c" line="1257"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1263"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </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>SAC: %2.1fl/min
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1244"/>
+        <location filename="../profile.c" line="1268"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1246"/>
+        <location filename="../profile.c" line="1270"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1272"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="1274"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="1277"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1260"/>
+        <location filename="../profile.c" line="1284"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3428,7 +3824,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1264"/>
+        <location filename="../profile.c" line="1288"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3437,402 +3833,395 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1276"/>
+        <location filename="../profile.c" line="1300"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Sikkerhetsstopp: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1279"/>
+        <location filename="../profile.c" line="1303"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Sikkerhetsstopp: ukjent tid @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="1308"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
+        <location filename="../profile.c" line="1311"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deko: ukjent tid @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1291"/>
+        <location filename="../profile.c" line="1315"/>
         <source>In deco
 </source>
         <translation>I deko
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1293"/>
+        <location filename="../profile.c" line="1317"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1297"/>
+        <location filename="../profile.c" line="1321"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (kalk.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1305"/>
+        <location filename="../profile.c" line="1329"/>
         <source>In deco (calc)
 </source>
         <translation>I deko (kalk.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1307"/>
+        <location filename="../profile.c" line="1331"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (kalk.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1310"/>
+        <location filename="../profile.c" line="1334"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (kalk.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1313"/>
+        <location filename="../profile.c" line="1337"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Kalkulert tak %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1319"/>
+        <location filename="../profile.c" line="1343"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Vev %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1325"/>
+        <location filename="../profile.c" line="1349"/>
         <source>heartbeat: %d
 </source>
         <translation>puls: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1327"/>
+        <location filename="../profile.c" line="1351"/>
         <source>bearing: %d
 </source>
         <translation>retning: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1419"/>
+        <location filename="../profile.c" line="1443"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</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>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1435"/>
+        <location filename="../profile.c" line="1459"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1439"/>
+        <location filename="../profile.c" line="1463"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</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>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1454"/>
+        <location filename="../profile.c" line="1478"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="273"/>
+        <location filename="../qt-gui.cpp" line="281"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="276"/>
+        <location filename="../qt-gui.cpp" line="284"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="392"/>
-        <source>%1, %2 %3, %4 %5:%6</source>
-        <translation>%1, %2 %3, %4 %5:%6</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="405"/>
-        <source>%1 %2, %3
-%4:%5</source>
-        <translation>%1 %2, %3
-%4:%5</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="418"/>
+        <location filename="../qt-gui.cpp" line="417"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 dykk)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="423"/>
+        <location filename="../qt-gui.cpp" line="422"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 dykk)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>boat</source>
         <translation>båt</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>shore</source>
         <translation>landdykk</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>drift</source>
         <translation>strømdykk</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>deep</source>
         <translation>dypdykk</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>cavern</source>
         <translation>hule</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>ice</source>
         <translation>isdykk</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>wreck</source>
         <translation>vrakdykk</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>cave</source>
         <translation>grotte</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>altitude</source>
         <translation>høydedykk</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>pool</source>
         <translation>basseng</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>lake</source>
         <translation>innsjø</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>river</source>
         <translation>elv</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>night</source>
         <translation>nattdykk</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>fresh</source>
         <translation>ferskvann</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>student</source>
         <translation>elev</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>photo</source>
         <translation>foto</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>video</source>
         <translation>video</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>instructor</source>
         <translation>instruktør</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="25"/>
         <source>deco</source>
         <translation>deko</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="216"/>
+        <location filename="../dive.c" line="133"/>
+        <source>ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="214"/>
         <source>more than %d days</source>
         <translation>mer enn %d dager</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="220"/>
         <source>%dd %dh %dmin</source>
         <translation>%dt %dt %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="224"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dh %dmin</source>
         <translation>%dt %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="235"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation>for dykk #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="242"/>
+        <location filename="../statistics.c" line="240"/>
         <source>for selected dives</source>
         <translation>for valgte dykk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="275"/>
         <source>for dive #%d</source>
         <translation>for dykk #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for selected dive</source>
         <translation>for valgte dykk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for all dives</source>
         <translation>for alle dykk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="283"/>
+        <location filename="../statistics.c" line="281"/>
         <source>(no dives)</source>
         <translation>(ingen dykk)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sun</source>
         <translation>søn</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Mon</source>
         <translation>man</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Tue</source>
         <translation>tir</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Wed</source>
         <translation>ons</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Thu</source>
         <translation>tor</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Fri</source>
         <translation>fre</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sat</source>
         <translation>lør</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jan</source>
         <translation>jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Feb</source>
         <translation>feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Mar</source>
         <translation>mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Apr</source>
         <translation>apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>May</source>
         <translation>mai</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jun</source>
         <translation>jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Jul</source>
         <translation>jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Aug</source>
         <translation>aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Sep</source>
         <translation>sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Oct</source>
         <translation>okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Nov</source>
         <translation>nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Dec</source>
         <translation>des</translation>
     </message>
@@ -3862,97 +4251,97 @@ Is the Uemis Zurich plugged in correctly?</source>
 Er Uemis Zurich plugget i ordentlig?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="107"/>
+        <location filename="../uemis-downloader.c" line="111"/>
         <source>unknown</source>
         <translation>ukjent</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="379"/>
+        <location filename="../uemis-downloader.c" line="383"/>
         <source>Reading %s %s</source>
         <translation>Leser %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="399"/>
+        <location filename="../uemis-downloader.c" line="403"/>
         <source>data</source>
         <translation>data</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="420"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>divelog entry id</source>
         <translation>id for oppføring i logg</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="422"/>
+        <location filename="../uemis-downloader.c" line="426"/>
         <source>divespot data id</source>
         <translation>id for dykkesteddata</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
+        <location filename="../uemis-downloader.c" line="428"/>
         <source>more data dive id</source>
         <translation>mer data dykke-id</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>wetsuit</source>
         <translation>våtdrakt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>semidry</source>
         <translation>semidry</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>drysuit</source>
         <translation>tørrdrakt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>shorty</source>
         <translation>shorty</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>vest</source>
         <translation>vest</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>long john</source>
         <translation>ermeløs våtdrakt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>jacket</source>
         <translation>overdel</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>full suit</source>
         <translation>hel drakt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>2 pcs full suit</source>
         <translation>todelt drakt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="620"/>
+        <location filename="../uemis-downloader.c" line="624"/>
         <source>membrane</source>
         <translation>skalldrakt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="802"/>
+        <location filename="../uemis-downloader.c" line="823"/>
         <source>Init Communication</source>
         <translation>Start kommunikasjon</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="804"/>
+        <location filename="../uemis-downloader.c" line="825"/>
         <source>Uemis init failed</source>
         <translation>Klarer ikke å lese fra Uemis</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="815"/>
+        <location filename="../uemis-downloader.c" line="836"/>
         <source>Start download</source>
         <translation>Start nedlasting</translation>
     </message>
@@ -3973,18 +4362,18 @@ Er Uemis Zurich plugget i ordentlig?</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="203"/>
-        <source>PO2 Green Warning</source>
-        <translation>Advarsel: grønn / pO₂</translation>
+        <source>pO₂ Green Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
-        <source>PO2 Ascend Warning</source>
-        <translation>Advarsel: oppstigning / pO₂</translation>
+        <source>pO₂ Ascend Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="208"/>
-        <source>PO2 Ascend Alarm</source>
-        <translation>Alarm: oppstigning / pO₂</translation>
+        <source>pO₂ Ascend Alarm</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
@@ -4046,5 +4435,214 @@ Er Uemis Zurich plugget i ordentlig?</translation>
         <source>Low Battery Alert</source>
         <translation>Alarm: dårlig batteri</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"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="36"/>
+        <source>Date:</source>
+        <translation>Dato:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="38"/>
+        <source>Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="40"/>
+        <source>Duration:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="41"/>
+        <source>min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="43"/>
+        <source>Max Depth:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="46"/>
+        <source>Air Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="48"/>
+        <source>Water Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="50"/>
+        <source>Location:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="54"/>
+        <source>Notes:</source>
+        <translation>Notater:</translation>
+    </message>
+</context>
+<context>
+    <name>plannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="14"/>
+        <source>Form</source>
+        <translation>Skjema</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="35"/>
+        <source>Rates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="56"/>
+        <source>Ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="77"/>
+        <source>below 75% avg. depth</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="94"/>
+        <source>75%-50% avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="111"/>
+        <source>50% avg. depth - 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="128"/>
+        <source>6m/20ft to surface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="148"/>
+        <source>Descent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="200"/>
+        <source>surface to the bottom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="226"/>
+        <source>Planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="247"/>
+        <source>GF low</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="264"/>
+        <source>GF high</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
+        <source>Drop to first depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
+        <source>Last Stop at 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>plan backgas breaks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="318"/>
+        <source>Gas Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <source>bottom SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="349"/>
+        <source>deco SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="359"/>
+        <source>bottom pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="389"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="382"/>
+        <source>deco pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="421"/>
+        <source>Dive Notes</source>
+        <translation>Dykk</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="445"/>
+        <source>display runtime</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="458"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="461"/>
+        <source>display segment duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="471"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="474"/>
+        <source>display transitions in deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="481"/>
+        <source>verbatim diveplan</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_nl_NL.ts b/translations/subsurface_nl_NL.ts
index a297300d3..d71ddcc1d 100644
--- a/translations/subsurface_nl_NL.ts
+++ b/translations/subsurface_nl_NL.ts
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="nl_NL" version="2.0">
+<defaultcodec>UTF-8</defaultcodec>
 <context>
     <name>CylindersModel</name>
     <message>
@@ -37,42 +38,42 @@
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="71"/>
+        <location filename="../qt-ui/models.cpp" line="70"/>
         <source>Switch at</source>
         <translation>Wissel op</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>Klik hier om de fles te verwijderen.</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>Fles kan niet verwijderd worden</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>Dit gas wordt gebruikt. Enkel flessen die niet gebruikt worden kunnen verwijderd worden.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="507"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="508"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="527"/>
+        <location filename="../qt-ui/models.cpp" line="532"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="528"/>
+        <location filename="../qt-ui/models.cpp" line="533"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -100,22 +101,22 @@ duikcomputer wilt verwijderen?</translation>
 <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>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Device ID</source>
         <translation>Toestel ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Nickname</source>
         <translation>Apparaatnaam</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>Klik hier om deze duikcomputer te verwijderen.</translation>
     </message>
@@ -123,190 +124,326 @@ duikcomputer wilt verwijderen?</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="90"/>
-        <source>air</source>
-        <translation>lucht</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="92"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</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>Schakel om naar OC</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> begin</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> eind</translation>
     </message>
 </context>
 <context>
-    <name>DiveGasPressureItem</name>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="475"/>
-        <source>air</source>
-        <translation>lucht</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="476"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-</context>
-<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1258"/>
-        <source> l/min</source>
-        <translation>l/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
-        <source> cuft/min</source>
-        <translation>cuft/min</translation>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <source>/min</source>
+        <translation>/min</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>Zoekvak Tonen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="706"/>
         <source>expand all</source>
         <translation>alles uitklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="740"/>
+        <location filename="../qt-ui/divelistview.cpp" line="707"/>
         <source>collapse all</source>
         <translation>alles inklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="741"/>
+        <location filename="../qt-ui/divelistview.cpp" line="708"/>
         <source>collapse others</source>
         <translation>andere samenklappen</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>duik(en) uit trip verwijderen</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>nieuwe duik aanmaken hierboven</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>duik(en) toevoegen aan de trip hierboven</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>Voeg duik(en) toe aan de trip hieronder</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>trip samenvoegen met trip hierboven</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>trip samenvoegen met trip hieronder</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>duik(en) verwijderen</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>markeer duik(en) als ongeldig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
-        <source>save As</source>
-        <translation>bewaren Als</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="763"/>
-        <source>export As UDDF</source>
-        <translation>Als UDDF exporteren</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="764"/>
-        <source>export As CSV</source>
-        <translation>als CSV exporteren</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="744"/>
+        <source>renumber dive(s)</source>
+        <translation>Duik(en) opnieuw nummeren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="765"/>
+        <location filename="../qt-ui/divelistview.cpp" line="745"/>
         <source>shift times</source>
         <translation>tijdstippen verschuiven</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="766"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>load images</source>
         <translation>afbeeldingen laden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="769"/>
-        <source>upload dive(s) to divelogs.de</source>
-        <translation>duik(en) laden op divelogs.de</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Open Image Files</source>
+        <translation>Afbeelding openen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation>Afbeeldingen (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <source>merge selected dives</source>
+        <translation>geselecteerde duiken samenvoegen</translation>
+    </message>
+</context>
+<context>
+    <name>DiveLogExportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
+        <source>Export Dive Log Files</source>
+        <translation>Logboek bestanden exporteren</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="24"/>
+        <source>General Export</source>
+        <translation>Algemene Export</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="30"/>
+        <source>Export format</source>
+        <translation>Exporteer opmaak</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="42"/>
+        <source>Subsurface XML</source>
+        <translation>Subsurface XML</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="61"/>
+        <source>UDDF</source>
+        <translation>UDDF</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="74"/>
+        <source>divelogs.de</source>
+        <translation>divelogs.de</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="84"/>
+        <source>CSV</source>
+        <translation>CSV</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="94"/>
+        <source>Worldmap</source>
+        <translation>Wereldkaart</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="107"/>
+        <source>Selection</source>
+        <translation>Selectie</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="116"/>
+        <source>Selected dives</source>
+        <translation>Geselecteerde duiken</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="126"/>
+        <source>All dives</source>
+        <translation>Alle duiken</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="178"/>
+        <source>HTML</source>
+        <translation>HTML</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="184"/>
+        <source>General Settings</source>
+        <translation>Algemene Instellingen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="190"/>
+        <source>Subsurface Numbers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="203"/>
+        <source>Selected Dives</source>
+        <translation>Geselecteerde Duiken</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="216"/>
+        <source>Minimum Javascript</source>
+        <translation>Minimum Javascript</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="229"/>
+        <source>All Dives</source>
+        <translation>Alle Duiken</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="239"/>
+        <source>Export List only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="252"/>
+        <source>Style Options</source>
+        <translation>Opmaakstijl opties</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="264"/>
+        <source>Font</source>
+        <translation>Lettertype</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="274"/>
+        <source>Font size</source>
+        <translation>Lettertype grootte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="795"/>
-        <source>Save Dives As...</source>
-        <translation>Duiken Bewaren Als</translation>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
+        <source>8</source>
+        <translation>8</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="814"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <source>10</source>
+        <translation>10</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <source>12</source>
+        <translation>12</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <source>14</source>
+        <translation>14</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <source>16</source>
+        <translation>16</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <source>18</source>
+        <translation>18</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <source>20</source>
+        <translation>20</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="323"/>
+        <source>Theme</source>
+        <translation>Thema</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
+        <source>Light</source>
+        <translation>Licht</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <source>Sand</source>
+        <translation>Zand</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="153"/>
         <source>Export UDDF File as</source>
         <translation>Exporteer UDDF bestand als</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>UDDF bestanden (*.uddf *.UDDF)</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>Exporteer CSV bestand als</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>CSV Bestanden (*.csv *.CSV)</translation>
+        <translation>CSV bestanden (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Open Image Files</source>
-        <translation>Afbeelding openen</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="162"/>
+        <source>Export World Map</source>
+        <translation>Wereldkaart exporteren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
-        <translation>Afbeeldingen (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="163"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="177"/>
+        <source>HTML files (*.html)</source>
+        <translation>HTML bestanden (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="760"/>
-        <source>merge selected dives</source>
-        <translation>geselecteerde duiken samenvoegen</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="167"/>
+        <source>Export Subsurface XML</source>
+        <translation>Exporteer Subsurface XML</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="168"/>
+        <source>XML files (*.xml *.ssrf)</source>
+        <translation>XML bestanden (*.xml *.ssrf)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="176"/>
+        <source>Export HTML files as</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -317,138 +454,133 @@ duikcomputer wilt verwijderen?</translation>
         <translation>Duiklogboek importeren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="36"/>
-        <source>Import CSV Dive Log Files</source>
-        <translation>CSV Duiklogboeken importeren</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="50"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
         <source>CSV options</source>
         <translation>CSV opties</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="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>Scheiding tussen velden</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>Vooraf ingestelde import</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>Veld Configuratie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="80"/>
         <source>Depth</source>
         <translation>Diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="100"/>
         <source>Stopdepth</source>
         <translation>Stop diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="107"/>
         <source>PO2</source>
         <translation>PO₂</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>Tijd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="121"/>
         <source>Temp</source>
         <translation>Temperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="151"/>
         <source>Cns</source>
         <translation>Cns</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>Eenheden</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>Metrisch</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>Imperiaal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="248"/>
         <source>Manual dives</source>
         <translation>Handmatige duiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="283"/>
         <source>Dive #</source>
         <translation>Duik #</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="317"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="385"/>
         <source>Duration</source>
         <translation>Duur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="470"/>
         <source>Tags</source>
         <translation>Trefwoorden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
         <source>Location</source>
         <translation>Locatie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="453"/>
         <source>Gps</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="300"/>
         <source>Max depth</source>
         <translation>Max diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="334"/>
         <source>Mean depth</source>
         <translation>Gemiddelde diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="368"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="402"/>
         <source>Notes</source>
         <translation>Notities</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="436"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
@@ -456,105 +588,70 @@ duikcomputer wilt verwijderen?</translation>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="71"/>
-        <source>Bottom SAC</source>
-        <translation>Gasverbruik (bodem)</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="106"/>
+        <source>Planned Dive Time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="85"/>
-        <source>SAC on DECO Stop</source>
-        <translation>Gasverbruik tijdens decostop</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="134"/>
+        <source>Altitude</source>
+        <translation>Hoogte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="78"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="98"/>
-        <source>GFLow</source>
-        <translation>GFLow</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="125"/>
-        <source>Last Stop at 6m</source>
-        <translation>Laatste stop op 6m</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="174"/>
-        <source>Start Time</source>
-        <translation>Starttijd</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="181"/>
+        <location filename="../qt-ui/diveplanner.ui" line="141"/>
         <source>ATM Pressure</source>
         <translation>Druk (atm)</translation>
     </message>
-</context>
-<context>
-    <name>DivePlannerGraphics</name>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="114"/>
-        <source>10m</source>
-        <translation>10m</translation>
-    </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="116"/>
-        <source>30ft</source>
-        <translation>30ft</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="148"/>
+        <source>mbar</source>
+        <translation>mbar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="363"/>
-        <source>Handler Position Error</source>
-        <translation>Geleider Positie Fout</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>
-        <translation>Een of meer stops zullen verloren gaan.
-Verwijder deze eerst.</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="158"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="445"/>
-        <source>AIR</source>
-        <translation>AIR</translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="137"/>
+        <source>unknown</source>
+        <translation>onbekend</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1148"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="586"/>
         <source>Final Depth</source>
         <translation>Eind diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1150"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="588"/>
         <source>Run time</source>
         <translation>Run time</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1152"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="590"/>
         <source>Duration</source>
         <translation>Duur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1154"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="592"/>
         <source>Used Gas</source>
         <translation>Verbruikt Gas</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>CC Set Point</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>Plan verwijderen?</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>U staat op het punt het plan te verwijderen</translation>
     </message>
@@ -562,17 +659,17 @@ Verwijder deze eerst.</translation>
 <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>Duikplanner punten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="256"/>
         <source>Available Gases</source>
         <translation>Beschikbare Gassen</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>duik punt toevoegen</translation>
     </message>
@@ -616,10 +713,25 @@ Verwijder deze eerst.</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
-        <source>Pressure  S</source>
+        <source>Pressure S</source>
         <translation>Druk S</translation>
     </message>
     <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <source>pN₂</source>
+        <translation>pN₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>pHe</source>
+        <translation>pHe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Pressure I</source>
         <translation>Druk I</translation>
@@ -634,86 +746,71 @@ Verwijder deze eerst.</translation>
         <source>SAC</source>
         <translation>Gasverbruik</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
-        <source>PN2</source>
-        <translation>pN₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
-        <source>PHE</source>
-        <translation>PHE</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
-        <source>PO2</source>
-        <translation>PO₂</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>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>date</source>
         <translation>datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1298"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>lbs</source>
         <translation>US pond</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
+        <location filename="../qt-ui/models.cpp" line="1307"/>
         <source>suit</source>
         <translation>duikpak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1310"/>
         <source>cyl</source>
         <translation>fles</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1344"/>
+        <location filename="../qt-ui/models.cpp" line="1325"/>
         <source>location</source>
         <translation>locatie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1316"/>
         <source>SAC</source>
         <translation>Gasverbruik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1338"/>
+        <location filename="../qt-ui/models.cpp" line="1319"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1341"/>
+        <location filename="../qt-ui/models.cpp" line="1322"/>
         <source>maxCNS</source>
         <translation>max. CNS</translation>
     </message>
@@ -721,115 +818,115 @@ Verwijder deze eerst.</translation>
 <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>Ongeldig antwoord van de server</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>XML etiket &apos;DiveDateReader&apos; werd verwacht, maar kreeg &apos;%1</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>Verwacht XML etket &apos;DiveDates&apos; werd niet gevonden</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>Slecht gevormd XML antwoord. Lijn %1: %2</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>geen duiken geselecteerd</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>kan zip bestand voor opladen niet aanmaken: %s</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>kan tijdelijk bestand niet aanmaken: %s</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>interne fout: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="181"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="179"/>
         <source>internal error</source>
         <translation>interne fout</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>Klaar</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>Duiklijst wordt opgeladen...</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>Duiklijst wordt geladen...</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>%1 duiken worden geladen...</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>Download klaar - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
         <source>Corrupted download</source>
         <translation>Beschadigde download</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>Het archief kon niet geopend worden:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Upload failed</source>
         <translation>Opladen mislukt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="849"/>
         <source>Upload successful</source>
         <translation>Opladen gelukt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="854"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="852"/>
         <source>Login failed</source>
         <translation>Login mislukt</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>Kan antwoord niet correct ontleden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="868"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Error: %1</source>
         <translation>Fout: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="835"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/>
         <source>Upload finished</source>
         <translation>Opladen klaar</translation>
     </message>
@@ -837,54 +934,54 @@ Verwijder deze eerst.</translation>
 <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>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="165"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/>
         <source>Error</source>
         <translation>Fout</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>Opnieuw</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>Uemis duikcomputer zoeken</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>Kies een bestand om duikcomputer log te downloaden</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>Log bestanden (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="339"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
         <source>Warning</source>
         <translation>Waarschuwing</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>Duiken worden NIET in de duiklijst geladen als u de libdivecomputer dump opslaat.</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>Kies een bestand voor de duikcomputer binaire dump</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>Dump bestanden (*.bin)</translation>
     </message>
@@ -952,7 +1049,7 @@ Verwijder deze eerst.</translation>
 <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>Bewerk geselecteerde duiklocaties</translation>
     </message>
@@ -961,848 +1058,858 @@ Verwijder deze eerst.</translation>
     <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>Duiknotities</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>Locatie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="148"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Coordinates</source>
         <translation>Coördinaten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="169"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
         <source>Divemaster</source>
         <translation>Duikleider</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="155"/>
+        <location filename="../qt-ui/maintab.ui" line="148"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="63"/>
-        <source>Start time</source>
-        <translation>Starttijd</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>Lucht temp</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>Water temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="127"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Tags</source>
         <translation>Trefwoorden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="223"/>
         <source>Rating</source>
         <translation>Waardering</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="236"/>
         <source>Visibility</source>
         <translation>Zicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="215"/>
+        <location filename="../qt-ui/maintab.ui" line="127"/>
         <source>Suit</source>
         <translation>Pak</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>Notities</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="270"/>
+        <location filename="../qt-ui/maintab.ui" line="311"/>
         <source>Equipment</source>
         <translation>Uitrusting</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="350"/>
+        <location filename="../qt-ui/maintab.ui" line="391"/>
         <source>Dive Info</source>
         <translation>Duikinformatie</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>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="414"/>
+        <location filename="../qt-ui/maintab.ui" line="275"/>
+        <source>Time</source>
+        <translation>Tijd</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="455"/>
         <source>Interval</source>
         <translation>Interval</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="433"/>
+        <location filename="../qt-ui/maintab.ui" line="474"/>
         <source>Gases Used</source>
         <translation>Gebruikte gassen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="452"/>
+        <location filename="../qt-ui/maintab.ui" line="493"/>
         <source>Gas Consumed</source>
         <translation>Gasverbruik</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>Gasverbruik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="531"/>
         <source>Max. Depth</source>
         <translation>Max. Diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="509"/>
+        <location filename="../qt-ui/maintab.ui" line="550"/>
         <source>Ave. Depth</source>
         <translation>Gem. Diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="528"/>
+        <location filename="../qt-ui/maintab.ui" line="569"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="547"/>
+        <location filename="../qt-ui/maintab.ui" line="588"/>
         <source>Air Pressure</source>
         <translation>Luchtdruk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="566"/>
+        <location filename="../qt-ui/maintab.ui" line="607"/>
         <source>Air Temperature</source>
         <translation>Luchttemperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="585"/>
+        <location filename="../qt-ui/maintab.ui" line="626"/>
         <source>Water Temperature</source>
         <translation>Watertemperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="604"/>
+        <location filename="../qt-ui/maintab.ui" line="645"/>
         <source>Dive Time</source>
         <translation>Duiktijd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="623"/>
+        <location filename="../qt-ui/maintab.ui" line="664"/>
         <source>Salinity</source>
         <translation>Zoutgehalte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="660"/>
+        <location filename="../qt-ui/maintab.ui" line="701"/>
         <source>Stats</source>
         <translation>Statistieken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="746"/>
         <source>Depth</source>
         <translation>Diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Temperature</source>
         <translation>Temperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="784"/>
         <source>Duration</source>
         <translation>Duur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Total Time</source>
         <translation>Totale tijd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="835"/>
         <source>Dives</source>
         <translation>Duiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
+        <source>Gas Consumption</source>
+        <translation>Gasverbruik</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="919"/>
+        <source>Photos</source>
+        <translation>Foto&apos;s</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="89"/>
         <source>Cylinders</source>
         <translation>Flessen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="90"/>
         <source>Add Cylinder</source>
         <translation>Fles toevoegen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="93"/>
         <source>Weights</source>
         <translation>Gewichten</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>Gewichtssysteem toevoegen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="438"/>
+        <location filename="../qt-ui/maintab.cpp" line="409"/>
         <source>Trip Location</source>
         <translation>Trip locatie</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>Trip Nota&apos;s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="42"/>
+        <location filename="../qt-ui/maintab.cpp" line="48"/>
         <source>Save</source>
         <translation>Opslaan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="46"/>
+        <location filename="../qt-ui/maintab.cpp" line="52"/>
         <source>Cancel</source>
         <translation>Annuleren</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>Lucht temp [%1]</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>Water temp [%1]</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>Deze trip wordt bewerkt.</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>Meerdere duiken worden bewerkt.</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>Deze duik wordt bewerkt.</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>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="494"/>
+        <location filename="../qt-ui/maintab.cpp" line="464"/>
         <source>unknown</source>
         <translation>onbekend</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>N</source>
-        <translation>N</translation>
+        <location filename="../qt-ui/maintab.cpp" line="501"/>
+        <source>Deepest Dive</source>
+        <translation>Diepste duik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>S</source>
-        <translation>Z</translation>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <source>Shallowest Dive</source>
+        <translation>Minst diepe duik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>E</source>
-        <translation>O</translation>
+        <location filename="../qt-ui/maintab.cpp" line="794"/>
+        <source>Discard the Changes?</source>
+        <translation>Wijzigingen niet opslaan?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>W</source>
-        <translation>W</translation>
+        <location filename="../qt-ui/maintab.cpp" line="795"/>
+        <source>You are about to discard your changes.</source>
+        <translation>U staat op het punt wijzigingen te verwijderen</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>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="571"/>
+        <location filename="../qt-ui/mainwindow.ui" line="646"/>
         <source>&amp;File</source>
         <translation>Bestand</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>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Details van het duikplan&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="583"/>
+        <source>Print</source>
+        <translation>Afdrukken</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:'Courier'; 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>&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;</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="606"/>
+        <location filename="../qt-ui/mainwindow.ui" line="679"/>
         <source>&amp;View</source>
         <translation>Toon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="628"/>
+        <location filename="../qt-ui/mainwindow.ui" line="701"/>
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="636"/>
+        <location filename="../qt-ui/mainwindow.ui" line="709"/>
         <source>&amp;Import</source>
         <translation>&amp;Importeren</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>&amp;Nieuw logboek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="655"/>
+        <location filename="../qt-ui/mainwindow.ui" line="728"/>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="658"/>
+        <location filename="../qt-ui/mainwindow.ui" line="731"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</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>Logboek &amp;Openen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="666"/>
+        <location filename="../qt-ui/mainwindow.ui" line="739"/>
         <source>Open</source>
         <translation>Open</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <location filename="../qt-ui/mainwindow.ui" line="742"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="674"/>
+        <location filename="../qt-ui/mainwindow.ui" line="747"/>
         <source>&amp;Save</source>
         <translation>Bewaar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="677"/>
+        <location filename="../qt-ui/mainwindow.ui" line="750"/>
         <source>Save</source>
         <translation>Opslaan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="680"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</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>Bewaren als</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>Save as</source>
         <translation>Opslaan als...</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>Ctrl+Shift+S</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>Sluiten</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Close</source>
         <translation>Sluiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="702"/>
+        <location filename="../qt-ui/mainwindow.ui" line="775"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="902"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <source>P&amp;references</source>
+        <translation>Voorkeuren</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="831"/>
+        <source>&amp;Add Dive</source>
+        <translation>Duik Toevoegen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <source>Auto &amp;Group</source>
+        <translation>Automatisch groeperen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="863"/>
+        <source>&amp;Dive List</source>
+        <translation>Duiklijst</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="871"/>
+        <source>&amp;Profile</source>
+        <translation>Profiel</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="879"/>
+        <source>&amp;Info</source>
+        <translation>Info</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="887"/>
+        <source>&amp;All</source>
+        <translation>Alle</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="895"/>
+        <source>P&amp;rev DC</source>
+        <translation>Vorige Duikcomputer</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="903"/>
+        <source>&amp;Next DC</source>
+        <translation>Volgende Duikcomputer</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="911"/>
+        <source>&amp;Select Events</source>
+        <translation>Selecteer gebeurtenissen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <source>&amp;About Subsurface</source>
+        <translation>Over Subsurface</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="937"/>
+        <source>&amp;Globe</source>
+        <translation>Wereldbol</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="953"/>
+        <source>&amp;Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="959"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="707"/>
-        <source>Export &amp;UDDF</source>
-        <translation>&amp;UDDF Exporteren</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="1008"/>
+        <source>&amp;Export</source>
+        <translation>Exporeren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1011"/>
+        <source>Export Dive Logs</source>
+        <translation>Duiklogboek exporteren</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1014"/>
+        <source>Ctrl+E</source>
+        <translation>Ctrl+E</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Enable the pN2 Graph</source>
         <translation>Toon de pN2 grafiek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <location filename="../qt-ui/mainwindow.ui" line="128"/>
         <source>Enable the pHe graph</source>
         <translation>Toon de pHe grafiek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <location filename="../qt-ui/mainwindow.ui" line="290"/>
         <source>Show/hide heart rate</source>
         <translation>Toon/verberg hartslag</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <location filename="../qt-ui/mainwindow.ui" line="342"/>
         <source>Enable EAD, END, and EADD</source>
         <translation>EAD, EED, END inschakelen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="238"/>
         <source>Show NDL / TTS</source>
         <translation>Toon NDL / TTS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="456"/>
+        <location filename="../qt-ui/mainwindow.ui" line="394"/>
         <source>Rescale depth axis</source>
         <translation>Diepteschaal herschalen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="710"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="715"/>
-        <source>Export HTML World Map</source>
-        <translation>HTML wereldkaart exporteren</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="718"/>
-        <source>Ctrl+H</source>
-        <translation>Ctrl+H</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="723"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>&amp;Print</source>
         <translation>Afdrukken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="734"/>
+        <location filename="../qt-ui/mainwindow.ui" line="791"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="742"/>
+        <location filename="../qt-ui/mainwindow.ui" line="799"/>
         <source>&amp;Quit</source>
         <translation>Afsluiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="753"/>
+        <location filename="../qt-ui/mainwindow.ui" line="810"/>
         <source>Import from &amp;dive computer</source>
         <translation>Importeren uit &amp;duikcomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="818"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation>&amp;GPS gegevens importeren van Subsurface Service</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="764"/>
+        <location filename="../qt-ui/mainwindow.ui" line="821"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="826"/>
         <source>&amp;Edit Device Names</source>
         <translation>Namen toestellen wijzigen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="834"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="782"/>
+        <location filename="../qt-ui/mainwindow.ui" line="839"/>
         <source>&amp;Renumber</source>
         <translation>Hernummeren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="785"/>
+        <location filename="../qt-ui/mainwindow.ui" line="842"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="798"/>
+        <location filename="../qt-ui/mainwindow.ui" line="855"/>
         <source>&amp;Yearly Statistics</source>
         <translation>Jaarlijkse Statistieken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="801"/>
+        <location filename="../qt-ui/mainwindow.ui" line="858"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="806"/>
-        <source>Dive List</source>
-        <translation>Duiklijst</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="814"/>
-        <source>Profile</source>
-        <translation>Profiel</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="822"/>
-        <source>Info</source>
-        <translation>Informatie</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="830"/>
-        <source>All</source>
-        <translation>Alle</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="872"/>
+        <location filename="../qt-ui/mainwindow.ui" line="929"/>
         <source>User &amp;Manual</source>
         <translation>Handleiding</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="880"/>
-        <source>Globe</source>
-        <translation>Wereldbol</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="888"/>
+        <location filename="../qt-ui/mainwindow.ui" line="945"/>
         <source>P&amp;lan Dive</source>
         <translation>Duik P&amp;lannen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="891"/>
+        <location filename="../qt-ui/mainwindow.ui" line="948"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="907"/>
-        <source>Import from Divelogs.de</source>
-        <translation>Importeren van Divelogs.de</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1003"/>
         <source>&amp;Check for Updates</source>
         <translation>Zoek naar Updates</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="951"/>
-        <source>Export CSV</source>
-        <translation>als CSV exporteren</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="726"/>
+        <location filename="../qt-ui/mainwindow.ui" line="783"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</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>pO₂ grafiek inschakelen</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>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="316"/>
         <source>Enable MOD</source>
         <translation>MOD inschakelen</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>Toon door duikcomputer aangegeven plafond</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>Toon berekend plafond</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>Toon berekend plafond in 3m stappen</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>Bereken alle compartimenten</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>Toon SAC</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>In-/Uitschakelen Meetlat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="731"/>
-        <source>Preferences</source>
-        <translation>Instellingen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="745"/>
+        <location filename="../qt-ui/mainwindow.ui" line="802"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="756"/>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="774"/>
-        <source>Add Dive</source>
-        <translation>Duik Toevoegen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="793"/>
-        <source>Auto Group</source>
-        <translation>Automatisch Groeperen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="809"/>
+        <location filename="../qt-ui/mainwindow.ui" line="866"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="817"/>
+        <location filename="../qt-ui/mainwindow.ui" line="874"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <location filename="../qt-ui/mainwindow.ui" line="882"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="833"/>
+        <location filename="../qt-ui/mainwindow.ui" line="890"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="838"/>
-        <source>Prev DC</source>
-        <translation>Vorige DC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="841"/>
+        <location filename="../qt-ui/mainwindow.ui" line="898"/>
         <source>Left</source>
         <translation>Links</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="846"/>
-        <source>Next DC</source>
-        <translation>Volgende DC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="849"/>
+        <location filename="../qt-ui/mainwindow.ui" line="906"/>
         <source>Right</source>
         <translation>Rechts</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="854"/>
-        <source>Select Events</source>
-        <translation>gebeurtenissen selecteren</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <location filename="../qt-ui/mainwindow.ui" line="916"/>
         <source>Input Plan</source>
         <translation>Voer plan in</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="864"/>
-        <source>About Subsurface</source>
-        <translation>Over Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="875"/>
+        <location filename="../qt-ui/mainwindow.ui" line="932"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="883"/>
+        <location filename="../qt-ui/mainwindow.ui" line="940"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="896"/>
-        <source>Import Log Files</source>
-        <translation>Importeer logboeken</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="899"/>
+        <location filename="../qt-ui/mainwindow.ui" line="956"/>
         <source>Import divelog files from other applications</source>
         <translation>Importeer logboeken uit andere programma&apos;s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="915"/>
+        <location filename="../qt-ui/mainwindow.ui" line="964"/>
+        <source>Import &amp;from Divelogs.de</source>
+        <translation>Importeren van Divelogs.de</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="972"/>
         <source>&amp;Full Screen</source>
         <translation>Volledig scherm</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>Volledig Scherm in-/uitschakelen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <location filename="../qt-ui/mainwindow.ui" line="978"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="174"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
         <source>Open File</source>
         <translation>Bestand openen</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>Bewaar of maak de huidige wijziging ongedaan voor U het bestand sluit.</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>
-        <translation>Bewaar of maak de huidige wijziging ongedaan voor U een duik plant.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="396"/>
+        <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>Bewaar of maak de huidige wijziging ongedaan voor U een duik toevoegt.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="645"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="419"/>
+        <source>Print runtime table</source>
+        <translation>Runtime tabel afdrukken</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="710"/>
         <source>Do you want to save the changes you made in the file %1?</source>
         <translation>Wilt u de wijzigingen in bestand %1 bewaren?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="647"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="712"/>
         <source>Do you want to save the changes you made in the datafile?</source>
         <translation>Wilt u de wijzigingen bijhouden in het bestand?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="652"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="717"/>
         <source>Save Changes?</source>
         <translation>Aanpassingen opslaan?</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>Wijzigingen gaan verloren als u deze niet bewaart.</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>Bestand Bewaren als</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>Waarschuwing</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>Bewaar of maak de huidige wijziging ongedaan voor u een nieuw bestand opent.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="280"/>
-        <source>Export UDDF File as</source>
-        <translation>UDDF Exporteren</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="281"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>UDDF bestanden (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="289"/>
-        <source>Export CSV File as</source>
-        <translation>Exporteer CSV bestand als</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="290"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>CSV bestanden (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="299"/>
-        <source>Export World Map</source>
-        <translation>Wereldkaart exporteren</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="300"/>
-        <source>HTML files (*.html)</source>
-        <translation>HTML bestanden (*.html)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="449"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="514"/>
         <source>Yearly Statistics</source>
         <translation>Jaarlijkse statistieken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="961"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1076"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML bestanden (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1199"/>
         <source>Open Dive Log File</source>
         <translation>Open Duiklogboek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <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>Duiklogboek bestanden (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML Bestanden (*.xml);;UDDF/UDCF Bestanden (*.uddf *.udcf);;JDiveLog Bestanden (*.jlb);;Suunto Bestanden (*.sde *.db);;CSV Bestanden (*.csv);;All Bestanden (*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1225"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Rond de huidige wijziging af vooraleer een volgende te beginnen.</translation>
     </message>
 </context>
 <context>
+    <name>PlannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Last stop at 20ft</source>
+        <translation>Laatste stop op 20ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="416"/>
+        <source>Last stop at 6m</source>
+        <translation>Laatste stop op 6m</translation>
+    </message>
+</context>
+<context>
     <name>PreferencesDialog</name>
     <message>
         <location filename="../qt-ui/preferences.ui" line="85"/>
@@ -1825,247 +1932,297 @@ Verwijder deze eerst.</translation>
         <translation>Taal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="141"/>
+        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <source>Network</source>
+        <translation>Netwerk</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="151"/>
         <source>Lists and Tables</source>
         <translation>Lijsten en Tabellen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font</source>
         <translation>Lettertype</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="167"/>
         <source>Font size</source>
         <translation>Lettertype grootte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="170"/>
+        <location filename="../qt-ui/preferences.ui" line="180"/>
         <source>Dives</source>
         <translation>Duiken</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>Standaard Duikbestand</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="188"/>
+        <location filename="../qt-ui/preferences.ui" line="198"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="197"/>
+        <location filename="../qt-ui/preferences.ui" line="207"/>
         <source>Display Invalid</source>
         <translation>Ongeldig Scherm</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="214"/>
+        <location filename="../qt-ui/preferences.ui" line="224"/>
         <source>Default Cylinder</source>
         <translation>Standaard fles</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>Gebruik standaard fles</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <location filename="../qt-ui/preferences.ui" line="247"/>
         <source>Animations</source>
         <translation>Animaties</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <location filename="../qt-ui/preferences.ui" line="253"/>
         <source>Speed</source>
         <translation>Snelheid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="270"/>
+        <location filename="../qt-ui/preferences.ui" line="280"/>
         <source>Subsurface Webservice</source>
         <translation>Subsurface Webservice</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>Standaard Gebruikers ID</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>Bewaar Gebruikers ID lokaal?</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="312"/>
+        <source>Reset all settings to their default value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
         <source>System</source>
         <translation>Systeem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="348"/>
         <source>Metric</source>
         <translation>Metrisch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="333"/>
+        <location filename="../qt-ui/preferences.ui" line="358"/>
         <source>Imperial</source>
         <translation>Imperiaal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="343"/>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
         <source>Personalize</source>
         <translation>Personaliseren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="392"/>
         <source>Depth</source>
         <translation>Diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="374"/>
+        <location filename="../qt-ui/preferences.ui" line="399"/>
         <source>meter</source>
         <translation>meter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="409"/>
         <source>feet</source>
         <translation>voet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="401"/>
+        <location filename="../qt-ui/preferences.ui" line="426"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="411"/>
+        <location filename="../qt-ui/preferences.ui" line="436"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="428"/>
+        <location filename="../qt-ui/preferences.ui" line="453"/>
         <source>liter</source>
         <translation>liter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="438"/>
+        <location filename="../qt-ui/preferences.ui" line="463"/>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="455"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="465"/>
+        <location filename="../qt-ui/preferences.ui" line="490"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="482"/>
+        <location filename="../qt-ui/preferences.ui" line="507"/>
         <source>kg</source>
         <translation>kg</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>drempelwaarde wanneer pO₂ getoond wordt</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>drempelwaarde wanneer pN₂ getoond wordt</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>drempelwaarde wanneer pHe getoond wordt</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="636"/>
-        <source>max ppO₂ when showing MOD</source>
-        <translation>max ppO₂ wanneer MOD getoond wordt</translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="811"/>
+        <source>Proxy</source>
+        <translation>Proxy</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="817"/>
+        <source>Proxy type</source>
+        <translation>Proxy type</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="830"/>
+        <source>Host</source>
+        <translation>Host</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="856"/>
+        <source>Port</source>
+        <translation>Poort</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="882"/>
+        <source>Requires authentication</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="657"/>
+        <location filename="../qt-ui/preferences.ui" line="925"/>
+        <source>Password</source>
+        <translation>Wachtwoord</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="682"/>
         <source>draw dive computer reported ceiling red</source>
         <translation>Toon door duikcomputer aangegeven plafond in rood</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="747"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>System Default</source>
         <translation>Systeem Standaardinstelling</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="767"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="419"/>
         <source>Pressure</source>
         <translation>Druk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="421"/>
+        <location filename="../qt-ui/preferences.ui" line="446"/>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="448"/>
+        <location filename="../qt-ui/preferences.ui" line="473"/>
         <source>Temperature</source>
         <translation>Temperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="475"/>
+        <location filename="../qt-ui/preferences.ui" line="500"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="517"/>
         <source>lbs</source>
         <translation>US pond</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="507"/>
+        <location filename="../qt-ui/preferences.ui" line="532"/>
         <source>Time units</source>
         <translation>Tijdseenheden</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>Stijg-/daalsnelheid noemer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="520"/>
+        <location filename="../qt-ui/preferences.ui" line="545"/>
         <source>Minutes</source>
         <translation>Minuten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="530"/>
+        <location filename="../qt-ui/preferences.ui" line="555"/>
         <source>Seconds</source>
         <translation>Seconden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="562"/>
+        <location filename="../qt-ui/preferences.ui" line="587"/>
         <source>Show</source>
         <translation>Toon</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="693"/>
         <source>Show non-used cylinders in Equipment Tab</source>
         <translation>Toon niet gebruikte flessen in het Uitrusting tabblad</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>Toon gemiddelde diepte</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>GFLow op max diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="691"/>
+        <location filename="../qt-ui/preferences.ui" line="716"/>
         <source>Misc</source>
         <translation>Allerlei</translation>
     </message>
@@ -2075,35 +2232,65 @@ Verwijder deze eerst.</translation>
         <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="697"/>
+        <location filename="../qt-ui/preferences.ui" line="722"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="739"/>
         <source>GFHigh</source>
         <translation>GFHigh</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="24"/>
+        <source>System proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="25"/>
+        <source>HTTP proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="26"/>
+        <source>SOCKS proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="245"/>
         <source>Restart required</source>
         <translation>Herstarten noodzakelijk</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>Om een nieuwe taal te laden dient u Subsurface te herstarten.</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>Standaard Logboek Openen</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>Subsurface XML bestanden (*.ssrf *.xml *.XML)</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="394"/>
+        <source>Warning</source>
+        <translation>Waarschuwing</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"/>
+    </message>
 </context>
 <context>
     <name>PrintDialog</name>
@@ -2244,72 +2431,72 @@ Verwijder deze eerst.</translation>
 <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>onbekend</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>Duik #%1 - %2</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>Max diepte: %1 %2</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>Duur: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1918"/>
+        <location filename="../qt-ui/models.cpp" line="1898"/>
         <source>Gas Used:</source>
         <translation>Verbruikt gas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1920"/>
+        <location filename="../qt-ui/models.cpp" line="1900"/>
         <source>SAC:</source>
         <translation>Gasverbruik:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1922"/>
+        <location filename="../qt-ui/models.cpp" line="1902"/>
         <source>Max. CNS:</source>
         <translation>Max. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1924"/>
+        <location filename="../qt-ui/models.cpp" line="1904"/>
         <source>Weights:</source>
         <translation>Gewichten:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1929"/>
+        <location filename="../qt-ui/models.cpp" line="1909"/>
         <source>Notes:</source>
         <translation>Nota&apos;s:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1936"/>
+        <location filename="../qt-ui/models.cpp" line="1916"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1938"/>
+        <location filename="../qt-ui/models.cpp" line="1918"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1940"/>
+        <location filename="../qt-ui/models.cpp" line="1920"/>
         <source>Suit:</source>
         <translation>Duikpak:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1942"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>Viz:</source>
         <translation>Zichtbaarheid:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1944"/>
+        <location filename="../qt-ui/models.cpp" line="1924"/>
         <source>Rating:</source>
         <translation>Beoordeling:</translation>
     </message>
@@ -2317,62 +2504,77 @@ Verwijder deze eerst.</translation>
 <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> (#%1 van %2)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/>
+        <source>Make first divecomputer</source>
+        <translation>Eerste duikcomputer aanmaken</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="906"/>
+        <source>Delete this divecomputer</source>
+        <translation>Deze duikcomputer verwijderen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="913"/>
         <source>Add Gas Change</source>
         <translation>Gaswissel toevoegen</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>Bladwijzer toevoegen</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>Gebeurtenis verwijderen</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>Gelijkaardige gebeurtenissen verbergen</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>Naam bewerken</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>Toon alle gebeurtenissen</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>Gebeurtenissen verbergen</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>Alle %1 gebeurtenissen verbergen?</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>Geselecteerde gebeurtenis verwijderen?</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>%1 @ %2:%3</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>Naam bladwijzer bewerken</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>Naam:</translation>
     </message>
@@ -2380,12 +2582,12 @@ Verwijder deze eerst.</translation>
 <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>AIR</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>Dit punt verwijderen</translation>
     </message>
@@ -2395,22 +2597,22 @@ Verwijder deze eerst.</translation>
         <translation>Sluiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="34"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation>Gemiddelde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="37"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation>Kleinste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="40"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation>Grootste</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>Verplaats de kaart en dubbelklikk om de duiklocatie te selecteren</translation>
     </message>
@@ -2424,9 +2626,23 @@ Verwijder deze eerst.</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="128"/>
         <source>New starting number</source>
         <translation>Nieuw beginnummer</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="126"/>
+        <source>New number</source>
+        <translation>Nieuw nummer</translation>
+    </message>
+</context>
+<context>
+    <name>SearchBar</name>
+    <message>
+        <location filename="../qt-ui/searchbar.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulier</translation>
+    </message>
 </context>
 <context>
     <name>ShiftImageTimesDialog</name>
@@ -2441,42 +2657,47 @@ Verwijder deze eerst.</translation>
         <translation>Tijdsstip voor afbeelding(en) verschuiven met</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="102"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="95"/>
+        <source>h:mm</source>
+        <translation>u:mm</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="105"/>
         <source>earlier</source>
         <translation>vroeger</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="109"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="112"/>
         <source>later</source>
         <translation>later</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>Neem een foto van uw duikcomputer die de tijd aangeeft om het verschil tussen de klok van uw duikcomputer en uw camera te berekenen. Laad dat beeld op uw computer en druk op deze knop.</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>Bereken tijdsverschil met camera</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>Selecteer afbeelding van duikcomputer die de tijd aangeeft</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>Welke datum en tijd worden weergegeven in de afbeelding?</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>Afbeelding openen</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>Afbeeldingen (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2556,42 +2777,42 @@ Verwijder deze eerst.</translation>
 <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>Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/>
         <source>Connecting...</source>
         <translation>Verbinding wordt opgezet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="421"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="419"/>
         <source>Download finished</source>
         <translation>Download klaar</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>Download fout: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/>
         <source>Connection Error: </source>
         <translation>Verbindingsfout:</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>Ongeldige gebruikersidentificatie</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>Kan antwoord niet parsen!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/>
         <source>Download Success!</source>
         <translation>Laden succesvol voltooid!</translation>
     </message>
@@ -2607,17 +2828,17 @@ Verwijder deze eerst.</translation>
 <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>Beschrijving</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2625,7 +2846,7 @@ Verwijder deze eerst.</translation>
 <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>Informatie</translation>
     </message>
@@ -2633,42 +2854,42 @@ Verwijder deze eerst.</translation>
 <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>Zoek naar updates.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="37"/>
-        <source>&lt;h3&gt;Subsurface was unable to check for updates.&lt;/h3&gt;</source>
-        <translation>&lt;h3&gt;Subsurface kon niet zoeken naar updates.&lt;/h3&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="36"/>
+        <source>Subsurface was unable to check for updates.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
-        <source>&lt;br/&gt;&lt;b&gt;The following error occurred:&lt;/b&gt;&lt;br/&gt;</source>
-        <translation>&lt;br/&gt;&lt;b&gt;De volgende fout gebeurde:&lt;/b&gt;&lt;br/&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="41"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="43"/>
-        <source>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Please check your internet connection.&lt;/b&gt;</source>
-        <translation>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Controleer uw internetverbinding.&lt;/b&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
     </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>U gebruikt de laatste nieuwe versie van subsurface</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>Er is een nieuwe versie van subsurface beschikbaar.&lt;br/&gt;Klik op:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; om te downloaden.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="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>&lt;b&gt;Er is een nieuwe versie van subsurface beschikbaar.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</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>Bij het zoeken naar updates trad een fout op.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -2676,25 +2897,163 @@ Verwijder deze eerst.</translation>
 <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>Handleiding</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>De handleiding kan niet gevonden worden</translation>
     </message>
 </context>
 <context>
+    <name>UserSurvey</name>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>Dialoog</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="47"/>
+        <source>Subsurface User Survey</source>
+        <translation>Subsurface gebruikersenquete</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>We zouden graag meer weten over onze gebruikers, hun voorkeuren en hun gewoontes. Neem a.u.b. even de tijd om dit formulier in te vullen en het naar het Subsurface team te verzenden. Selecteer alle opties die van toepassing zijn.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="79"/>
+        <source>Recreational DIver</source>
+        <translation>Recreatieve Duiker</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="92"/>
+        <source>Tech Diver</source>
+        <translation>Techduiker</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="105"/>
+        <source>Interested in dive planning</source>
+        <translation>Geïnteresseerd in duikplanning</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="118"/>
+        <source>I am downloading dives from supported dive computer</source>
+        <translation>Ik download duiken van een ondersteunde duikcomputer</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="131"/>
+        <source>I am importing dives from other software / sources</source>
+        <translation>Ik importeer duiken uit andere software / bronnen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="144"/>
+        <source>I am manually entering dives</source>
+        <translation>Ik voer duiken met de hand in</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="167"/>
+        <source>I use the Android companion app to track dive locations</source>
+        <translation>Ik gebruik de Android toepassing om duiklocaties bij te houden</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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="27"/>
+        <source>
+Operating System: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="30"/>
+        <source>
+CPU Architecture: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="35"/>
+        <source>
+OS CPU Architecture %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="39"/>
+        <source>
+Language: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="73"/>
+        <source>Should we ask you later?</source>
+        <translation>Mogen we dit later vragen?</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="74"/>
+        <source>Don&apos;t ask me again</source>
+        <translation>Niet opnieuw vragen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="75"/>
+        <source>Ask Later</source>
+        <translation>Later vragen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="76"/>
+        <source>Ask again?</source>
+        <translation>Opnieuw vragen?</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <source>Submit User Survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <source>Subsurface was unable to submit the user survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="101"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="102"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="111"/>
+        <source>Survey successfully submitted.</source>
+        <translation type="unfinished"/>
+    </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>Bij het zoeken naar updates trad een fout op.&lt;br/&gt;&lt;br/&gt;%1</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>Beschrijving</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="723"/>
+        <location filename="../qt-ui/models.cpp" line="721"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2742,12 +3101,12 @@ Verwijder deze eerst.</translation>
         <translation>Uploaden</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>Operatie duurt te lang</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="279"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="277"/>
         <source>Transfering data...</source>
         <translation>Gegevens worden overgebracht...</translation>
     </message>
@@ -2755,37 +3114,37 @@ Verwijder deze eerst.</translation>
 <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</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="368"/>
+        <location filename="../qt-ui/models.cpp" line="373"/>
         <source>Weight</source>
         <translation>Gewicht</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>Hier klikken om het gewichtssysteem te verwijderen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="453"/>
+        <location filename="../qt-ui/models.cpp" line="458"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="454"/>
+        <location filename="../qt-ui/models.cpp" line="459"/>
         <source>lbs</source>
         <translation>US pond</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="478"/>
+        <location filename="../qt-ui/models.cpp" line="483"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="484"/>
         <source>m</source>
         <translation>m</translation>
     </message>
@@ -2793,79 +3152,79 @@ Verwijder deze eerst.</translation>
 <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>Jaar
  &gt; Maand / Trip</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1643"/>
         <source>Duration 
  Total</source>
         <translation>Duur
  Totaal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>
 Average</source>
         <translation>
 Gemiddeld</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>
 Shortest</source>
         <translation>
 Kortste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>
 Longest</source>
         <translation>
 Langste</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>Diepte (%1)
  Gemiddeld</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>
 Minimum</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>
 Maximum</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>Gasverbruik (%1)
  Gemiddeld</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>Temp. (%1)
@@ -2875,99 +3234,92 @@ Maximum</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="58"/>
+        <location filename="../dive.c" line="87"/>
         <source>pascal</source>
         <translation>Pa</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>bar</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>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="104"/>
-        <location filename="../qt-gui.cpp" line="292"/>
-        <source>l</source>
-        <translation>l</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>cuft</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>m</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>ft</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>US pond</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>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1120"/>
+        <location filename="../dive.c" line="1237"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) of (%s)</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>lucht</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="170"/>
+        <location filename="../equipment.c" line="210"/>
         <source>integrated</source>
         <translation>Geïntegreerd</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="171"/>
+        <location filename="../equipment.c" line="211"/>
         <source>belt</source>
         <translation>riem</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="172"/>
+        <location filename="../equipment.c" line="212"/>
         <source>ankle</source>
         <translation>enkel</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="173"/>
+        <location filename="../equipment.c" line="213"/>
         <source>backplate weight</source>
         <translation>backplate-gewicht</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="174"/>
+        <location filename="../equipment.c" line="214"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -2984,253 +3336,253 @@ Maximum</translation>
         <translation>Het maximum aantal kolommen bij CSV importeren is %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>none</source>
         <translation>geen</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>deco stop</source>
         <translation>decompressiestop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>rbt</source>
         <translation>RBT</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ascent</source>
         <translation>opstijging</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ceiling</source>
         <translation>plafond</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>workload</source>
         <translation>werklast</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>transmitter</source>
         <translation>zender</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>violation</source>
         <translation>schending</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>bookmark</source>
         <translation>bladwijzer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>surface</source>
         <translation>oppervlakte</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>safety stop</source>
         <translation>veiligheidsstop</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>gaswissel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (voluntary)</source>
         <translation>veiligheidsstop (vrijwillig)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (mandatory)</source>
         <translation>veiligheidsstop (verplicht)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>deepstop</source>
         <translation>diepe stop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>ceiling (safety stop)</source>
         <translation>plafond (veiligheidsstop)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>divetime</source>
         <translation>duiktijd</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>onder de vloer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>maxdepth</source>
         <translation>Max. diepte</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>PO2</source>
         <translation>PO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>airtime</source>
         <translation>resterende luchttijd</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>rgbm</source>
         <translation>RGBM</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>heading</source>
         <translation>koers</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>tissue level warning</source>
         <translation>waarschuwing stikstofbelasting</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>non stop time</source>
         <translation>nultijd</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="163"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>invalid event number</source>
         <translation>ongeldig event-nummer</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>Kan geen parser creëren voor %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="411"/>
+        <location filename="../libdivecomputer.c" line="414"/>
         <source>Error registering the data</source>
         <translation>Fout bij het registreren van de data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="419"/>
+        <location filename="../libdivecomputer.c" line="422"/>
         <source>Error parsing the datetime</source>
         <translation>Fout bij verwerken van de datum en tijd</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="438"/>
         <source>Dive %d: %s %d %04d</source>
         <translation>Duik nr. %d: %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="440"/>
+        <location filename="../libdivecomputer.c" line="443"/>
         <source>Error parsing the divetime</source>
         <translation>Fout bij verwerken van de duikduur</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="449"/>
+        <location filename="../libdivecomputer.c" line="452"/>
         <source>Error parsing the maxdepth</source>
         <translation>Fout bij het verwerken van de maximum duikdiepte</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="458"/>
+        <location filename="../libdivecomputer.c" line="461"/>
         <source>Error parsing the gas mix count</source>
         <translation>Fout bij het verwerken van het aantal gasmengsels</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="470"/>
+        <location filename="../libdivecomputer.c" line="473"/>
         <source>Error obtaining water salinity</source>
         <translation>Fout bij het verkrijgen van het zoutgehalte</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error obtaining surface pressure</source>
         <translation>Fout bij bekomen van oppervlaktedruk</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the gas mix</source>
         <translation>Fout bij het verwerken van het gasmengsel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="493"/>
+        <location filename="../libdivecomputer.c" line="496"/>
         <source>Error parsing the samples</source>
         <translation>Fout bij het verwerken van de samples</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="623"/>
+        <location filename="../libdivecomputer.c" line="626"/>
         <source>Event: waiting for user action</source>
         <translation>Event: wachten op handeling van gebruiker</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>model=%u (0x%08x), firmware=%u (0x%08x), serienummer=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="691"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the event handler.</source>
         <translation>Fout bij het registreren van de event handler.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="696"/>
+        <location filename="../libdivecomputer.c" line="699"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Fout bij het registreren van de cancellation handler.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="717"/>
+        <location filename="../libdivecomputer.c" line="720"/>
         <source>Dive data import error</source>
         <translation>Fout bij importeren van duikdata</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="756"/>
+        <location filename="../libdivecomputer.c" line="759"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Kan geen context creëren voor libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="763"/>
+        <location filename="../libdivecomputer.c" line="766"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Fout bij openen van  %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="462"/>
+        <location filename="../parse-xml.c" line="466"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Vreemde percentage %s
 </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>Fout bij analyse van &apos;%s&apos;</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>Database-query get_events mislukt.
 </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>Database query get_tags mislukt.
@@ -3244,111 +3596,160 @@ Maximum</translation>
 </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 '%s'.
 </source>
         <translation>Database-query mislukt: &apos;%s&apos;
 </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>Database query get_cylinders mislukt.
 </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>Database query get_changes mislukt.
 </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>Database query get_profile_sample mislukt.
 </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>Kan de stylesheet %s niet openen</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>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="146"/>
-        <location filename="../planner.c" line="617"/>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation>Kan gasmengsel %d/%d niet vinden</translation>
+        <location filename="../planner.c" line="159"/>
+        <location filename="../planner.c" line="752"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation>Gas %s kan niet gevonden worden</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="308"/>
+        <location filename="../planner.c" line="345"/>
         <source>Too many gas mixes</source>
         <translation>Teveel gasmengsels</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="489"/>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation>%s
-Subsurface duikplan
-Gebaseerd op GFlow =  %.0f en GFhigh = %.0f
-
-</translation>
+        <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>NIET-AANSPRAKELIJKHEIDSVERKLARING / WAARSCHUWING: DIT IS EEN NIEUWE IMPLEMENTATIE VAN HET BUHLMANN ALGORITME EN EEN IMPLEMENTATIE VAN EEN DUIKPLANNER DIE HIEROP GEBASEERD IS. BEIDE IMPLEMENTATIES HEBBEN MAAR EEN BEPERKTE MATE VAN TESTEN ONDERGAAN. WIJ RADEN MET KLEM AF DUIKEN UIT TE VOEREN DIE GEBASEERD ZIJN OP DE RESULTATEN DIE HIER GETOOND WORDEN.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="530"/>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Ga naar %.*f %s over %d:%02d min - looptijd %d:%02u op %s
-</translation>
+        <location filename="../planner.c" line="535"/>
+        <source>based on GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="539"/>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Blijft op %.*f %s gedurende %d:%02d min - looptijd %d:%02u op %s
-</translation>
+        <location filename="../planner.c" line="538"/>
+        <source>Subsurface dive plan</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="550"/>
-        <source>Switch gas to %s
-</source>
-        <translation>Gaswissel naar %s
-</translation>
+        <location filename="../planner.c" line="542"/>
+        <source>depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="558"/>
-        <source>Gas consumption:
-</source>
-        <translation>Gasverbruik:
-</translation>
+        <location filename="../planner.c" line="545"/>
+        <source>runtime</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="569"/>
-        <source>%.0f%s of %s
-</source>
-        <translation>%.0f%s %s
-</translation>
+        <location filename="../planner.c" line="548"/>
+        <source>duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="551"/>
+        <source>gas</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="606"/>
+        <source>%3.0f%s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
+        <source>%3dmin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="629"/>
+        <source>Switch gas to %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="638"/>
+        <source>Gas consumption:</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="659"/>
+        <source>this is more gas than available in the specified cylinder!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="664"/>
+        <source>not enough reserve for gas sharing on ascent!</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="668"/>
+        <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="810"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="980"/>
         <source>ean</source>
         <translation>EAN</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1226"/>
+        <location filename="../profile.c" line="1250"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3357,70 +3758,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1229"/>
+        <location filename="../profile.c" line="1253"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1233"/>
+        <location filename="../profile.c" line="1257"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1263"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </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>SAC: %2.1fl/min
+        <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1244"/>
+        <location filename="../profile.c" line="1268"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1246"/>
+        <location filename="../profile.c" line="1270"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO₂%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1272"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN₂%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="1274"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="1277"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1260"/>
+        <location filename="../profile.c" line="1284"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3429,7 +3830,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1264"/>
+        <location filename="../profile.c" line="1288"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3438,402 +3839,395 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1276"/>
+        <location filename="../profile.c" line="1300"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Veiligheidsstop: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1279"/>
+        <location filename="../profile.c" line="1303"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Veiligheidsstop: onbek tijd @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="1308"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
+        <location filename="../profile.c" line="1311"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: onbek tijd @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1291"/>
+        <location filename="../profile.c" line="1315"/>
         <source>In deco
 </source>
         <translation>In deco
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1293"/>
+        <location filename="../profile.c" line="1317"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1297"/>
+        <location filename="../profile.c" line="1321"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %umin @ %.0f%s (berekend)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1305"/>
+        <location filename="../profile.c" line="1329"/>
         <source>In deco (calc)
 </source>
         <translation>In deco (berekend)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1307"/>
+        <location filename="../profile.c" line="1331"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (berekend)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1310"/>
+        <location filename="../profile.c" line="1334"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (berekend)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1313"/>
+        <location filename="../profile.c" line="1337"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Berekend plafond %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1319"/>
+        <location filename="../profile.c" line="1343"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Compartiment %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1325"/>
+        <location filename="../profile.c" line="1349"/>
         <source>heartbeat: %d
 </source>
         <translation>hartslag: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1327"/>
+        <location filename="../profile.c" line="1351"/>
         <source>bearing: %d
 </source>
         <translation>koers: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1419"/>
+        <location filename="../profile.c" line="1443"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</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>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1435"/>
+        <location filename="../profile.c" line="1459"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1439"/>
+        <location filename="../profile.c" line="1463"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</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>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1454"/>
+        <location filename="../profile.c" line="1478"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="273"/>
+        <location filename="../qt-gui.cpp" line="281"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="276"/>
+        <location filename="../qt-gui.cpp" line="284"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="392"/>
-        <source>%1, %2 %3, %4 %5:%6</source>
-        <translation>%1, %2 %3, %4 %5:%6</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="405"/>
-        <source>%1 %2, %3
-%4:%5</source>
-        <translation>%1 %2, %3
-%4:%5</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="418"/>
+        <location filename="../qt-gui.cpp" line="417"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 duiken)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="423"/>
+        <location filename="../qt-gui.cpp" line="422"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 duik)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>boat</source>
         <translation>boot</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>shore</source>
         <translation>kust</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>drift</source>
         <translation>drift</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>deep</source>
         <translation>diep</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>cavern</source>
         <translation>spelonk</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>ice</source>
         <translation>ijs</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>wreck</source>
         <translation>wrak</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>cave</source>
         <translation>grot</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>altitude</source>
         <translation>hoogte</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>pool</source>
         <translation>zwembad</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>lake</source>
         <translation>meer</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>river</source>
         <translation>rivier</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>night</source>
         <translation>nacht</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>fresh</source>
         <translation>zoet</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>student</source>
         <translation>student</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>photo</source>
         <translation>foto</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>video</source>
         <translation>video</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>instructor</source>
         <translation>instructeur</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="25"/>
         <source>deco</source>
         <translation>decompressie</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="216"/>
+        <location filename="../dive.c" line="133"/>
+        <source>ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="214"/>
         <source>more than %d days</source>
         <translation>meer dan %d dagen</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="220"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %du %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="224"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dh %dmin</source>
         <translation>%du %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="235"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation>voor duik nr.</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="242"/>
+        <location filename="../statistics.c" line="240"/>
         <source>for selected dives</source>
         <translation>voor de geselecteerde duiken</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="275"/>
         <source>for dive #%d</source>
         <translation>Voor duik nr. %d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for selected dive</source>
         <translation>voor de geselecteerde duik</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for all dives</source>
         <translation>voor alle duiken</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="283"/>
+        <location filename="../statistics.c" line="281"/>
         <source>(no dives)</source>
         <translation>(geen duiken)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sun</source>
         <translation>Zo</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Mon</source>
         <translation>Ma</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Tue</source>
         <translation>Di</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Wed</source>
         <translation>Wo</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Thu</source>
         <translation>Do</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Fri</source>
         <translation>Vr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sat</source>
         <translation>Za</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jan</source>
         <translation>jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Feb</source>
         <translation>feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Mar</source>
         <translation>mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Apr</source>
         <translation>apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>May</source>
         <translation>mei</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jun</source>
         <translation>jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Jul</source>
         <translation>jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Aug</source>
         <translation>aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Sep</source>
         <translation>sept</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Oct</source>
         <translation>okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Nov</source>
         <translation>nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Dec</source>
         <translation>dec</translation>
     </message>
@@ -3863,97 +4257,97 @@ Is the Uemis Zurich plugged in correctly?</source>
 Is de Uemis Zurich correkt aangesloten?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="107"/>
+        <location filename="../uemis-downloader.c" line="111"/>
         <source>unknown</source>
         <translation>onbekend</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="379"/>
+        <location filename="../uemis-downloader.c" line="383"/>
         <source>Reading %s %s</source>
         <translation>Lezen %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="399"/>
+        <location filename="../uemis-downloader.c" line="403"/>
         <source>data</source>
         <translation>gegevens</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="420"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>divelog entry id</source>
         <translation>Duiklog gegeven ID</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="422"/>
+        <location filename="../uemis-downloader.c" line="426"/>
         <source>divespot data id</source>
         <translation>Duiklocatie data ID</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
+        <location filename="../uemis-downloader.c" line="428"/>
         <source>more data dive id</source>
         <translation>meer data voor duik ID</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>wetsuit</source>
         <translation>natpak</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>semidry</source>
         <translation>semidroog</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>drysuit</source>
         <translation>droogpak</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>shorty</source>
         <translation>shorty</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>vest</source>
         <translation>vest</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>long john</source>
         <translation>long john</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>jacket</source>
         <translation>jack</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>full suit</source>
         <translation>tweedelig pak</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>2 pcs full suit</source>
         <translation>2-delig pak</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="620"/>
+        <location filename="../uemis-downloader.c" line="624"/>
         <source>membrane</source>
         <translation>membraan droogpak</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="802"/>
+        <location filename="../uemis-downloader.c" line="823"/>
         <source>Init Communication</source>
         <translation>Initialiseer communicatie</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="804"/>
+        <location filename="../uemis-downloader.c" line="825"/>
         <source>Uemis init failed</source>
         <translation>Uemis niet geïnitialiseerd</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="815"/>
+        <location filename="../uemis-downloader.c" line="836"/>
         <source>Start download</source>
         <translation>Begin download</translation>
     </message>
@@ -3974,18 +4368,18 @@ Is de Uemis Zurich correkt aangesloten?</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="203"/>
-        <source>PO2 Green Warning</source>
-        <translation>Waarschuwing: PO₂ Groen</translation>
+        <source>pO₂ Green Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
-        <source>PO2 Ascend Warning</source>
-        <translation>Waarschuwing: Opstijging / PO₂</translation>
+        <source>pO₂ Ascend Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="208"/>
-        <source>PO2 Ascend Alarm</source>
-        <translation>Alarm: Opstijging / PO₂</translation>
+        <source>pO₂ Ascend Alarm</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
@@ -4047,5 +4441,214 @@ Is de Uemis Zurich correkt aangesloten?</translation>
         <source>Low Battery Alert</source>
         <translation>Alarm: Lege batterij</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"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="36"/>
+        <source>Date:</source>
+        <translation>Datum:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="38"/>
+        <source>Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="40"/>
+        <source>Duration:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="41"/>
+        <source>min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="43"/>
+        <source>Max Depth:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="46"/>
+        <source>Air Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="48"/>
+        <source>Water Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="50"/>
+        <source>Location:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="54"/>
+        <source>Notes:</source>
+        <translation>Nota&apos;s:</translation>
+    </message>
+</context>
+<context>
+    <name>plannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulier</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="35"/>
+        <source>Rates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="56"/>
+        <source>Ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="77"/>
+        <source>below 75% avg. depth</source>
+        <translation>Beneden 75% gem. diepte</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="94"/>
+        <source>75%-50% avg. depth</source>
+        <translation>75%-50% gem. diepte</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="111"/>
+        <source>50% avg. depth - 6m/20ft</source>
+        <translation>50% gem. diepte - 6m/20ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="128"/>
+        <source>6m/20ft to surface</source>
+        <translation>6m/20ft tot oppervlakte</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="148"/>
+        <source>Descent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="200"/>
+        <source>surface to the bottom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="226"/>
+        <source>Planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="247"/>
+        <source>GF low</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="264"/>
+        <source>GF high</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
+        <source>Drop to first depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
+        <source>Last Stop at 6m/20ft</source>
+        <translation>Laatste Stop op 6m/20ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>plan backgas breaks</source>
+        <translation>plan backgas pauzes</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="318"/>
+        <source>Gas Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <source>bottom SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="349"/>
+        <source>deco SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="359"/>
+        <source>bottom pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="389"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="382"/>
+        <source>deco pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="421"/>
+        <source>Dive Notes</source>
+        <translation>Duiknotities</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+        <source>In dive plan, show runtime (absolute time) of stops</source>
+        <translation>Toon runtime (absolute tijd) van de pauzes in het duikplan</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="445"/>
+        <source>display runtime</source>
+        <translation>Runtime tonen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="458"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
+        <translation>Toon duur (relatieve tijd) van de pauzes in het duikplan</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="461"/>
+        <source>display segment duration</source>
+        <translation>Toon duur van het segment</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="471"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
+        <translation>Toon overgangen of beschouw hen als geïmpliceerd in het duikplan</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="474"/>
+        <source>display transitions in deco</source>
+        <translation>Toon overgangen in deco</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="481"/>
+        <source>verbatim diveplan</source>
+        <translation>verbatim duikplan</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_pl_PL.ts b/translations/subsurface_pl_PL.ts
index 11d618b28..220cb2d46 100644
--- a/translations/subsurface_pl_PL.ts
+++ b/translations/subsurface_pl_PL.ts
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="pl_PL" version="2.0">
+<defaultcodec>UTF-8</defaultcodec>
 <context>
     <name>CylindersModel</name>
     <message>
@@ -37,42 +38,42 @@
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="71"/>
+        <location filename="../qt-ui/models.cpp" line="70"/>
         <source>Switch at</source>
         <translation>Zmiana na</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>Kliknięcie tu usunie butlę z listy.</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>Butla nie może być usunięta.</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>Ten gaz jest używany. Można usuwać tylko butle, których nie używasz.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="507"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="508"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="527"/>
+        <location filename="../qt-ui/models.cpp" line="532"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="528"/>
+        <location filename="../qt-ui/models.cpp" line="533"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -100,22 +101,22 @@ wybrany komputer nurkowy?</translation>
 <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>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Device ID</source>
         <translation>ID urządzenia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Nickname</source>
         <translation>Nazwa</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>Kliknięcie tu usunie komputer nurkowy.</translation>
     </message>
@@ -123,190 +124,326 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="90"/>
-        <source>air</source>
-        <translation>powietrze</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="92"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</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>Przejście na obieg otwarty</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> początek</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> koniec</translation>
     </message>
 </context>
 <context>
-    <name>DiveGasPressureItem</name>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="475"/>
-        <source>air</source>
-        <translation>powietrze</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="476"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-</context>
-<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1258"/>
-        <source> l/min</source>
-        <translation> l/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
-        <source> cuft/min</source>
-        <translation> cuft/min</translation>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <source>/min</source>
+        <translation>/min</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>Pokaż okno wyszukiwania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="706"/>
         <source>expand all</source>
         <translation>rozwiń wszystkie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="740"/>
+        <location filename="../qt-ui/divelistview.cpp" line="707"/>
         <source>collapse all</source>
         <translation>zwiń wszystkie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="741"/>
+        <location filename="../qt-ui/divelistview.cpp" line="708"/>
         <source>collapse others</source>
         <translation>zwiń pozostałe</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>usuń nurkowanie(a) z grupy</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>utwórz nową grupę powyżej</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>dodaj nurkowanie(a) do grupy powyżej</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>dodaj nurkowanie(a) do grupy poniżej</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>połącz grupę z grupą powyżej</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>połącz grupę z grupą poniżej</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>usuń nurkowanie(a)</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>oznacz nurkowanie(a) jak niepoprawne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
-        <source>save As</source>
-        <translation>zapisz jako</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="763"/>
-        <source>export As UDDF</source>
-        <translation>eksportuj jako plik UDDF</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="764"/>
-        <source>export As CSV</source>
-        <translation>eksportuj jako CSV</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="744"/>
+        <source>renumber dive(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="765"/>
+        <location filename="../qt-ui/divelistview.cpp" line="745"/>
         <source>shift times</source>
         <translation>zmień czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="766"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>load images</source>
         <translation>dodaj zdjęcia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="769"/>
-        <source>upload dive(s) to divelogs.de</source>
-        <translation>Wyślij nurkowanie(a) do divelogs.de</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Open Image Files</source>
+        <translation>Dodawanie zdjęć</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation>Pliki graficzne (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <source>merge selected dives</source>
+        <translation>połącz wybrane nurkowania</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="24"/>
+        <source>General Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="30"/>
+        <source>Export format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="42"/>
+        <source>Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="61"/>
+        <source>UDDF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="74"/>
+        <source>divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="84"/>
+        <source>CSV</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="94"/>
+        <source>Worldmap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="107"/>
+        <source>Selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="116"/>
+        <source>Selected dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="126"/>
+        <source>All dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="178"/>
+        <source>HTML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="184"/>
+        <source>General Settings</source>
+        <translation>Ogólne</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="190"/>
+        <source>Subsurface Numbers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="203"/>
+        <source>Selected Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="216"/>
+        <source>Minimum Javascript</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="229"/>
+        <source>All Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="239"/>
+        <source>Export List only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="252"/>
+        <source>Style Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="264"/>
+        <source>Font</source>
+        <translation>Czcionka</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="274"/>
+        <source>Font size</source>
+        <translation>Rozmiar czcionki</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
+        <source>8</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <source>10</source>
+        <translation>10</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <source>12</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <source>14</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="795"/>
-        <source>Save Dives As...</source>
-        <translation>Zapisz nurkowania jako...</translation>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <source>16</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="814"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <source>18</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <source>20</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="323"/>
+        <source>Theme</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <source>Sand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="153"/>
         <source>Export UDDF File as</source>
         <translation>Eksportuj plik UDDF jako</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>Pliki UDDF  (*.uddf *.UDDF)</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>Eksportuj plik CSV jako</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>pliki CSV (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Open Image Files</source>
-        <translation>Dodawanie zdjęć</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="162"/>
+        <source>Export World Map</source>
+        <translation>Eksport mapy świata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
-        <translation>Pliki graficzne (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="163"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="177"/>
+        <source>HTML files (*.html)</source>
+        <translation>Pliki HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="760"/>
-        <source>merge selected dives</source>
-        <translation>połącz wybrane nurkowania</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="167"/>
+        <source>Export Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="168"/>
+        <source>XML files (*.xml *.ssrf)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="176"/>
+        <source>Export HTML files as</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -317,138 +454,133 @@ wybrany komputer nurkowy?</translation>
         <translation>Importowanie logów nurkowych</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="36"/>
-        <source>Import CSV Dive Log Files</source>
-        <translation>Importuj plik CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="50"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
         <source>CSV options</source>
         <translation>Opcje CVS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="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>Separator danych</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>Predefiniowane konfiguracje</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>Konfiguracja pól</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="80"/>
         <source>Depth</source>
         <translation>Głębokość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="100"/>
         <source>Stopdepth</source>
         <translation>Przystanek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="107"/>
         <source>PO2</source>
         <translation>PO2</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>Czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="121"/>
         <source>Temp</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="151"/>
         <source>Cns</source>
         <translation>Cns</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>Jednostki</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>Metryczny</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>Imperialny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="248"/>
         <source>Manual dives</source>
         <translation>Nurkowania dodane ręcznie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="283"/>
         <source>Dive #</source>
         <translation>Nurkowanie #</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="317"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="385"/>
         <source>Duration</source>
         <translation>Czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="470"/>
         <source>Tags</source>
         <translation>Tagi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
         <source>Location</source>
         <translation>Miejsce</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="453"/>
         <source>Gps</source>
         <translation>Gps</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="300"/>
         <source>Max depth</source>
         <translation>Głębokość maksymalna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="334"/>
         <source>Mean depth</source>
         <translation>Głębokość średnia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="368"/>
         <source>Buddy</source>
         <translation>Partner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="402"/>
         <source>Notes</source>
         <translation>Opis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="436"/>
         <source>Weight</source>
         <translation>Balast</translation>
     </message>
@@ -456,105 +588,70 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="71"/>
-        <source>Bottom SAC</source>
-        <translation>SAC przy dnie</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="106"/>
+        <source>Planned Dive Time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="85"/>
-        <source>SAC on DECO Stop</source>
-        <translation>SAC na przystanku DECO</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="134"/>
+        <source>Altitude</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="78"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="98"/>
-        <source>GFLow</source>
-        <translation>GFLow</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="125"/>
-        <source>Last Stop at 6m</source>
-        <translation>Ostatni przystanek na 6m</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="174"/>
-        <source>Start Time</source>
-        <translation>Początek</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="181"/>
+        <location filename="../qt-ui/diveplanner.ui" line="141"/>
         <source>ATM Pressure</source>
         <translation>Ciśnienie atmosferyczne</translation>
     </message>
-</context>
-<context>
-    <name>DivePlannerGraphics</name>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="114"/>
-        <source>10m</source>
-        <translation>10m</translation>
-    </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="116"/>
-        <source>30ft</source>
-        <translation>30ft</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="148"/>
+        <source>mbar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="363"/>
-        <source>Handler Position Error</source>
-        <translation>Niedozwolone położenie punktu</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>
-        <translation>W wyniku tej operacji jeden lub więcej puntów znajdzie się
-poza zakresem. Proszę je najpierw usunąć.</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="158"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="445"/>
-        <source>AIR</source>
-        <translation>POWIETRZE</translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="137"/>
+        <source>unknown</source>
+        <translation>nieznana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1148"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="586"/>
         <source>Final Depth</source>
         <translation>Głębokość końcowa </translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1150"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="588"/>
         <source>Run time</source>
         <translation>Czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1152"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="590"/>
         <source>Duration</source>
         <translation>Czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1154"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="592"/>
         <source>Used Gas</source>
         <translation>Używany gaz</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>CC Set Point</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>Porzucić plan?</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>Masz zamiar porzucić plan</translation>
     </message>
@@ -562,17 +659,17 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <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>Plan nurkowy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="256"/>
         <source>Available Gases</source>
         <translation>Dostępne gazy</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>dodaj punkt do profilu</translation>
     </message>
@@ -616,8 +713,23 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
-        <source>Pressure  S</source>
-        <translation>Ciśnienie S</translation>
+        <source>Pressure S</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <source>pN₂</source>
+        <translation>pN₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>pHe</source>
+        <translation>pHe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
@@ -634,86 +746,71 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
-        <source>PN2</source>
-        <translation>PN2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
-        <source>PHE</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
-        <source>PO2</source>
-        <translation>PO2</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>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>date</source>
         <translation>data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1298"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
+        <location filename="../qt-ui/models.cpp" line="1307"/>
         <source>suit</source>
         <translation>skafander</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1310"/>
         <source>cyl</source>
         <translation>butla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1344"/>
+        <location filename="../qt-ui/models.cpp" line="1325"/>
         <source>location</source>
         <translation>miejsce</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1316"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1338"/>
+        <location filename="../qt-ui/models.cpp" line="1319"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1341"/>
+        <location filename="../qt-ui/models.cpp" line="1322"/>
         <source>maxCNS</source>
         <translation>maxCNS</translation>
     </message>
@@ -721,115 +818,115 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <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>Niepoprawna odpowiedź z serwera</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>Oczekiwano tagu XML &apos;DiveDateReader&apos;, zamiast tego odczytano &apos;%1</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>Oczekiwany tag XML  &apos;DiveDates&apos; nie został znaleziony</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>Uszkodzona odpowiedź XML. Linia  %1: %2</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>nie wybrano żadnych nurkowań</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>nie udało się utworzyć pliku zip do wysłania: %s</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>nie można utworzyć pliku tymczasowego: %s</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>błąd wewnętrzny: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="181"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="179"/>
         <source>internal error</source>
         <translation>błąd wewnętrzny</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>Zakończ</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>Wysyłanie listy nurkowań...</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>Pobieranie listy nurkowań...</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>Pobieranie %1 nurkowań...</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>Zakończono pobieranie - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
         <source>Corrupted download</source>
         <translation>Pobrano uskodzone dane</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>Archiwum nie mogło zostać otworzone:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Upload failed</source>
         <translation>Wysyłanie nieudane</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="849"/>
         <source>Upload successful</source>
         <translation>Wysyłanie zakończone sukcesem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="854"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="852"/>
         <source>Login failed</source>
         <translation>Błąd logowania</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>Nie można przetworzyć odpowiedzi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="868"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Error: %1</source>
         <translation>Błąd: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="835"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/>
         <source>Upload finished</source>
         <translation>Wysyłanie zakończone</translation>
     </message>
@@ -837,54 +934,54 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <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>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="165"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/>
         <source>Error</source>
         <translation>Błąd</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>Ponów</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>Wykryj komputer Uemis</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>Wybierz plik używany do logowania postępu pobierania danych</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>Pliki logów (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="339"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
         <source>Warning</source>
         <translation>Ostrzeżenie</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>Użycie libdivecomputer w trybie diagnostycznym spowoduje, że pobrane nurkowania NIE ZOSTANĄ dodane do listy nurkowań.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="351"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="352"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Wybierz plik do którego zapisane zostaną dane binarne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="353"/>
         <source>Dump files (*.bin)</source>
         <translation>Pliki binarne (*.bin)</translation>
     </message>
@@ -952,7 +1049,7 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <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>Wskaż miejsce zaznaczonych nurkowań</translation>
     </message>
@@ -961,848 +1058,854 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
     <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>Opis nurkowania</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>Miejsce</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="148"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Coordinates</source>
         <translation>Współrzędne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="169"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="155"/>
+        <location filename="../qt-ui/maintab.ui" line="148"/>
         <source>Buddy</source>
         <translation>Partner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="63"/>
-        <source>Start time</source>
-        <translation>Początek</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>Temperatura powietrza</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>Temperatura wody</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="127"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Tags</source>
         <translation>Tagi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="223"/>
         <source>Rating</source>
         <translation>Ocena</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="236"/>
         <source>Visibility</source>
         <translation>Widzialność</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="215"/>
+        <location filename="../qt-ui/maintab.ui" line="127"/>
         <source>Suit</source>
         <translation>Skafander</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>Opis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="270"/>
+        <location filename="../qt-ui/maintab.ui" line="311"/>
         <source>Equipment</source>
         <translation>Wyposażenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="350"/>
+        <location filename="../qt-ui/maintab.ui" line="391"/>
         <source>Dive Info</source>
         <translation>Informacje</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>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="414"/>
+        <location filename="../qt-ui/maintab.ui" line="275"/>
+        <source>Time</source>
+        <translation>Czas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="455"/>
         <source>Interval</source>
         <translation>Przerwa powierzchniowa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="433"/>
+        <location filename="../qt-ui/maintab.ui" line="474"/>
         <source>Gases Used</source>
         <translation>Dostępne gazy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="452"/>
+        <location filename="../qt-ui/maintab.ui" line="493"/>
         <source>Gas Consumed</source>
         <translation>Zużyty gaz</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>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="531"/>
         <source>Max. Depth</source>
         <translation>Max głębokość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="509"/>
+        <location filename="../qt-ui/maintab.ui" line="550"/>
         <source>Ave. Depth</source>
         <translation>Średnia głębokość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="528"/>
+        <location filename="../qt-ui/maintab.ui" line="569"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="547"/>
+        <location filename="../qt-ui/maintab.ui" line="588"/>
         <source>Air Pressure</source>
         <translation>Ciśnienie atmosferyczne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="566"/>
+        <location filename="../qt-ui/maintab.ui" line="607"/>
         <source>Air Temperature</source>
         <translation>Temperatura powietrza</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="585"/>
+        <location filename="../qt-ui/maintab.ui" line="626"/>
         <source>Water Temperature</source>
         <translation>Temperatura wody</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="604"/>
+        <location filename="../qt-ui/maintab.ui" line="645"/>
         <source>Dive Time</source>
         <translation>Czas nurkowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="623"/>
+        <location filename="../qt-ui/maintab.ui" line="664"/>
         <source>Salinity</source>
         <translation>Zasolenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="660"/>
+        <location filename="../qt-ui/maintab.ui" line="701"/>
         <source>Stats</source>
         <translation>Statystyka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="746"/>
         <source>Depth</source>
         <translation>Głębokość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="784"/>
         <source>Duration</source>
         <translation>Czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Total Time</source>
         <translation>Całkowity czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="835"/>
         <source>Dives</source>
         <translation>Nurkowania</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="919"/>
+        <source>Photos</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="89"/>
         <source>Cylinders</source>
         <translation>Butle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="90"/>
         <source>Add Cylinder</source>
         <translation>Dodaj butlę</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="93"/>
         <source>Weights</source>
         <translation>Balast</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>Dodaj balast</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="438"/>
+        <location filename="../qt-ui/maintab.cpp" line="409"/>
         <source>Trip Location</source>
         <translation>Miejsce nurkowań</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>Opis nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="42"/>
+        <location filename="../qt-ui/maintab.cpp" line="48"/>
         <source>Save</source>
         <translation>Zapisz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="46"/>
+        <location filename="../qt-ui/maintab.cpp" line="52"/>
         <source>Cancel</source>
         <translation>Anuluj</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>Temp. powietrza [%1]</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>Temp. wody [%1]</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>Ta grupa nurkowań jest obecnie edytowana.</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>Kilka nurkowań jest obecnie edytowanych.</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>To nurkowanie jest obecnie edytowane.</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>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="494"/>
+        <location filename="../qt-ui/maintab.cpp" line="464"/>
         <source>unknown</source>
         <translation>nieznana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>N</source>
-        <translation>N</translation>
+        <location filename="../qt-ui/maintab.cpp" line="501"/>
+        <source>Deepest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>S</source>
-        <translation>S</translation>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <source>Shallowest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>E</source>
-        <translation>E</translation>
+        <location filename="../qt-ui/maintab.cpp" line="794"/>
+        <source>Discard the Changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>W</source>
-        <translation>W</translation>
+        <location filename="../qt-ui/maintab.cpp" line="795"/>
+        <source>You are about to discard your changes.</source>
+        <translation type="unfinished"/>
     </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>Filtr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="571"/>
+        <location filename="../qt-ui/mainwindow.ui" line="646"/>
         <source>&amp;File</source>
         <translation>Plik</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="583"/>
+        <source>Print</source>
+        <translation>Drukuj</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:'Courier'; 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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
         <source>&amp;Log</source>
         <translation>Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="606"/>
+        <location filename="../qt-ui/mainwindow.ui" line="679"/>
         <source>&amp;View</source>
         <translation>Widok</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="628"/>
+        <location filename="../qt-ui/mainwindow.ui" line="701"/>
         <source>&amp;Help</source>
         <translation>Pomoc</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="636"/>
+        <location filename="../qt-ui/mainwindow.ui" line="709"/>
         <source>&amp;Import</source>
         <translation>Import</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>Nowy logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="655"/>
+        <location filename="../qt-ui/mainwindow.ui" line="728"/>
         <source>New</source>
         <translation>Nowy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="658"/>
+        <location filename="../qt-ui/mainwindow.ui" line="731"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</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>Otwórz logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="666"/>
+        <location filename="../qt-ui/mainwindow.ui" line="739"/>
         <source>Open</source>
         <translation>Otwórz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <location filename="../qt-ui/mainwindow.ui" line="742"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="674"/>
+        <location filename="../qt-ui/mainwindow.ui" line="747"/>
         <source>&amp;Save</source>
         <translation>Zapisz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="677"/>
+        <location filename="../qt-ui/mainwindow.ui" line="750"/>
         <source>Save</source>
         <translation>Zapisz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="680"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>Save as</source>
         <translation>Zapisz jako</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>Ctrl+Shift+S</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>Zamknij</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="702"/>
+        <location filename="../qt-ui/mainwindow.ui" line="775"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="902"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <source>P&amp;references</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="831"/>
+        <source>&amp;Add Dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <source>Auto &amp;Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="863"/>
+        <source>&amp;Dive List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="871"/>
+        <source>&amp;Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="879"/>
+        <source>&amp;Info</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="887"/>
+        <source>&amp;All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="895"/>
+        <source>P&amp;rev DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="903"/>
+        <source>&amp;Next DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="911"/>
+        <source>&amp;Select Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <source>&amp;About Subsurface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="937"/>
+        <source>&amp;Globe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="953"/>
+        <source>&amp;Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="959"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="707"/>
-        <source>Export &amp;UDDF</source>
-        <translation>Eksportuj UDDF</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="1008"/>
+        <source>&amp;Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1011"/>
+        <source>Export Dive Logs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1014"/>
+        <source>Ctrl+E</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Enable the pN2 Graph</source>
         <translation>Pokazuj wykres pN2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <location filename="../qt-ui/mainwindow.ui" line="128"/>
         <source>Enable the pHe graph</source>
         <translation>Pokazuj wykres pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <location filename="../qt-ui/mainwindow.ui" line="290"/>
         <source>Show/hide heart rate</source>
         <translation>Pokazuj tętno</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <location filename="../qt-ui/mainwindow.ui" line="342"/>
         <source>Enable EAD, END, and EADD</source>
         <translation>Pokazuj EAD, END, EADD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="238"/>
         <source>Show NDL / TTS</source>
         <translation>Pokazuj NDL / TTS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="456"/>
+        <location filename="../qt-ui/mainwindow.ui" line="394"/>
         <source>Rescale depth axis</source>
         <translation>Skalowanie osi głebokości</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="710"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="715"/>
-        <source>Export HTML World Map</source>
-        <translation>Eksport mapy świata w HTML</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="718"/>
-        <source>Ctrl+H</source>
-        <translation>Ctrl+H</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="723"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>&amp;Print</source>
         <translation>Drukuj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="734"/>
+        <location filename="../qt-ui/mainwindow.ui" line="791"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="742"/>
+        <location filename="../qt-ui/mainwindow.ui" line="799"/>
         <source>&amp;Quit</source>
         <translation>Wyjdź</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="753"/>
+        <location filename="../qt-ui/mainwindow.ui" line="810"/>
         <source>Import from &amp;dive computer</source>
         <translation>Importuj z komputera nurkowego</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="818"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation>Importuj dane GPS z Subsurface Service</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="764"/>
+        <location filename="../qt-ui/mainwindow.ui" line="821"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="826"/>
         <source>&amp;Edit Device Names</source>
         <translation>Edycja nazw komputerów nurkowych</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="834"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="782"/>
+        <location filename="../qt-ui/mainwindow.ui" line="839"/>
         <source>&amp;Renumber</source>
         <translation>Zmień numerację</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="785"/>
+        <location filename="../qt-ui/mainwindow.ui" line="842"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="798"/>
+        <location filename="../qt-ui/mainwindow.ui" line="855"/>
         <source>&amp;Yearly Statistics</source>
         <translation>Statystyka roczna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="801"/>
+        <location filename="../qt-ui/mainwindow.ui" line="858"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="806"/>
-        <source>Dive List</source>
-        <translation>Lista nurkowań</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="814"/>
-        <source>Profile</source>
-        <translation>Profil</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="822"/>
-        <source>Info</source>
-        <translation>Informacje</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="830"/>
-        <source>All</source>
-        <translation>Wszystkie</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="872"/>
+        <location filename="../qt-ui/mainwindow.ui" line="929"/>
         <source>User &amp;Manual</source>
         <translation>Instrukcja obsługi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="880"/>
-        <source>Globe</source>
-        <translation>Mapa</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="888"/>
+        <location filename="../qt-ui/mainwindow.ui" line="945"/>
         <source>P&amp;lan Dive</source>
         <translation>Zaplanuj nurkowanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="891"/>
+        <location filename="../qt-ui/mainwindow.ui" line="948"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="907"/>
-        <source>Import from Divelogs.de</source>
-        <translation>Importuj z Divelogs.de</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1003"/>
         <source>&amp;Check for Updates</source>
         <translation>Sprawdź dostępność aktualizacji</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="951"/>
-        <source>Export CSV</source>
-        <translation>Eksportuj CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="726"/>
+        <location filename="../qt-ui/mainwindow.ui" line="783"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</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>Pokazuj wykres pO2</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>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="316"/>
         <source>Enable MOD</source>
         <translation>Pokazuj MOD</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>Pokazuj sufit z komputera nurkowego</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>Pokazuj obliczony sufit</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>Pokazuj obliczony sufit z krokiem 3m</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>Obliczenia dla wszystkich tkanek</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>Pokazuj SAC</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>Pokazuj linijkę</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="731"/>
-        <source>Preferences</source>
-        <translation>Ustawienia</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="745"/>
+        <location filename="../qt-ui/mainwindow.ui" line="802"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="756"/>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="774"/>
-        <source>Add Dive</source>
-        <translation>Dodaj nurkowanie</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="793"/>
-        <source>Auto Group</source>
-        <translation>Automatycznie grupuj</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="809"/>
+        <location filename="../qt-ui/mainwindow.ui" line="866"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="817"/>
+        <location filename="../qt-ui/mainwindow.ui" line="874"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <location filename="../qt-ui/mainwindow.ui" line="882"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="833"/>
+        <location filename="../qt-ui/mainwindow.ui" line="890"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="838"/>
-        <source>Prev DC</source>
-        <translation>Poprzedni komputer</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="841"/>
+        <location filename="../qt-ui/mainwindow.ui" line="898"/>
         <source>Left</source>
         <translation>W lewo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="846"/>
-        <source>Next DC</source>
-        <translation>Następny komputer</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="849"/>
+        <location filename="../qt-ui/mainwindow.ui" line="906"/>
         <source>Right</source>
         <translation>W prawo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="854"/>
-        <source>Select Events</source>
-        <translation>Wybór zdarzeń</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <location filename="../qt-ui/mainwindow.ui" line="916"/>
         <source>Input Plan</source>
         <translation>Wprowadź plan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="864"/>
-        <source>About Subsurface</source>
-        <translation>O Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="875"/>
+        <location filename="../qt-ui/mainwindow.ui" line="932"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="883"/>
+        <location filename="../qt-ui/mainwindow.ui" line="940"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="896"/>
-        <source>Import Log Files</source>
-        <translation>Importowanie logów nurkowych</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="899"/>
+        <location filename="../qt-ui/mainwindow.ui" line="956"/>
         <source>Import divelog files from other applications</source>
         <translation>Importuj logi z innej aplikacji</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="915"/>
+        <location filename="../qt-ui/mainwindow.ui" line="964"/>
+        <source>Import &amp;from Divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="972"/>
         <source>&amp;Full Screen</source>
         <translation>Pełen ekran</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>Przełącz pełen ekran</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <location filename="../qt-ui/mainwindow.ui" line="978"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="174"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
         <source>Open File</source>
         <translation>Otwórz plik</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>Zapisz zmiany lub anuluj edycję tego nurkowania przed zamknięciem pliku.</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>
-        <translation>Zapisz zmiany lub anuluj edycję tego nurkowania przed planowaniem nowego.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="396"/>
+        <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>Zapisz zmiany lub anuluj edycję tego nurkowania przed dodaniem nowego.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="645"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="419"/>
+        <source>Print runtime table</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="710"/>
         <source>Do you want to save the changes you made in the file %1?</source>
         <translation>Czy chcesz zapisać zmiany dokonane w pliku %1?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="647"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="712"/>
         <source>Do you want to save the changes you made in the datafile?</source>
         <translation>Czy chcesz zapisać wprowadzone zmiany?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="652"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="717"/>
         <source>Save Changes?</source>
         <translation>Zapisać zmiany?</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>Zmiany zostaną utracone jeśli ich nie za zapiszesz.</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>Zapisz plik jako</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>Ostrzeżenie</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>Zapisz zmiany lub anuluj to nurkowanie przez otwarciem nowego pliku.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="280"/>
-        <source>Export UDDF File as</source>
-        <translation>Eksportuj plik UDDF jako</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="281"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>Pliki UDDF  (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="289"/>
-        <source>Export CSV File as</source>
-        <translation>Eksportuj plik CSV jako</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="290"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>pliki CSV (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="299"/>
-        <source>Export World Map</source>
-        <translation>Eksport mapy świata</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="300"/>
-        <source>HTML files (*.html)</source>
-        <translation>Pliki HTML (*.html)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="449"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="514"/>
         <source>Yearly Statistics</source>
         <translation>Statystyka roczna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="961"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1076"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Pliki Subsurface XML  (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1199"/>
         <source>Open Dive Log File</source>
         <translation>Otwórz plik z logiem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <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>logi nurkowe (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;Pliki XML (*.xml);;Pliki UDDF/UDCF (*.uddf *.udcf);;Pliki JDiveLog (*.jlb);;Pliki Suunto (*.sde *.db);;Pliki CSV(*.csv);;Wszystkie pliki(*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1225"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Proszę dokończyć edycję tego nurkowania przed rozpoczęciem kolejnej. </translation>
     </message>
 </context>
 <context>
+    <name>PlannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Last stop at 20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="416"/>
+        <source>Last stop at 6m</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>PreferencesDialog</name>
     <message>
         <location filename="../qt-ui/preferences.ui" line="85"/>
@@ -1825,247 +1928,297 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
         <translation>Język</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="151"/>
         <source>Lists and Tables</source>
         <translation>Listy i tabele</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font</source>
         <translation>Czcionka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="167"/>
         <source>Font size</source>
         <translation>Rozmiar czcionki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="170"/>
+        <location filename="../qt-ui/preferences.ui" line="180"/>
         <source>Dives</source>
         <translation>Nurkowania</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>Domyślny plik nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="188"/>
+        <location filename="../qt-ui/preferences.ui" line="198"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="197"/>
+        <location filename="../qt-ui/preferences.ui" line="207"/>
         <source>Display Invalid</source>
         <translation>Pokazuj nurkowania oznaczone jako niepoprawne </translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="214"/>
+        <location filename="../qt-ui/preferences.ui" line="224"/>
         <source>Default Cylinder</source>
         <translation>Domyślna butla</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>Użyj domyślnej butli</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <location filename="../qt-ui/preferences.ui" line="247"/>
         <source>Animations</source>
         <translation>Animacje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <location filename="../qt-ui/preferences.ui" line="253"/>
         <source>Speed</source>
         <translation>Prędkość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="270"/>
+        <location filename="../qt-ui/preferences.ui" line="280"/>
         <source>Subsurface Webservice</source>
         <translation>Usługa Internetowa Subsurface</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>Domyślne ID Użytkownika</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>Zapisywać ID użytkownika do pliku?</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="312"/>
+        <source>Reset all settings to their default value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="348"/>
         <source>Metric</source>
         <translation>Metryczny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="333"/>
+        <location filename="../qt-ui/preferences.ui" line="358"/>
         <source>Imperial</source>
         <translation>Imperialny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="343"/>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
         <source>Personalize</source>
         <translation>Dostosuj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="392"/>
         <source>Depth</source>
         <translation>Głębokość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="374"/>
+        <location filename="../qt-ui/preferences.ui" line="399"/>
         <source>meter</source>
         <translation>metry</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="409"/>
         <source>feet</source>
         <translation>stopy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="401"/>
+        <location filename="../qt-ui/preferences.ui" line="426"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="411"/>
+        <location filename="../qt-ui/preferences.ui" line="436"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="428"/>
+        <location filename="../qt-ui/preferences.ui" line="453"/>
         <source>liter</source>
         <translation>litry</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="438"/>
+        <location filename="../qt-ui/preferences.ui" line="463"/>
         <source>cu ft</source>
         <translation>stopy sześcienne (cu ft)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="455"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>celsius</source>
         <translation>stopnie Celsjusza</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="465"/>
+        <location filename="../qt-ui/preferences.ui" line="490"/>
         <source>fahrenheit</source>
         <translation>stopnie Fahrenheita</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="482"/>
+        <location filename="../qt-ui/preferences.ui" line="507"/>
         <source>kg</source>
         <translation>kg</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>próg ostrzeżenia dla  pO₂</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>próg ostrzeżenia dla  pN₂</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>próg ostrzeżenia dla  pHe</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="636"/>
-        <source>max ppO₂ when showing MOD</source>
-        <translation>max ppO₂ gdy wyświetlany jest MOD</translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="811"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="817"/>
+        <source>Proxy type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="830"/>
+        <source>Host</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="856"/>
+        <source>Port</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="882"/>
+        <source>Requires authentication</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="657"/>
+        <location filename="../qt-ui/preferences.ui" line="925"/>
+        <source>Password</source>
+        <translation>Hasło</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="682"/>
         <source>draw dive computer reported ceiling red</source>
         <translation>Pokazuj sufit z komputera nurkowego na czerwono</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="747"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>System Default</source>
         <translation>Domyślne ustawienia systemu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="767"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>Filter</source>
         <translation>Filtr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="419"/>
         <source>Pressure</source>
         <translation>Ciśnienie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="421"/>
+        <location filename="../qt-ui/preferences.ui" line="446"/>
         <source>Volume</source>
         <translation>Objętość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="448"/>
+        <location filename="../qt-ui/preferences.ui" line="473"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="475"/>
+        <location filename="../qt-ui/preferences.ui" line="500"/>
         <source>Weight</source>
         <translation>Balast</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="517"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="507"/>
+        <location filename="../qt-ui/preferences.ui" line="532"/>
         <source>Time units</source>
         <translation>Jednostki czasu</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>Mianownik szybkości zanurzania/wynurzania </translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="520"/>
+        <location filename="../qt-ui/preferences.ui" line="545"/>
         <source>Minutes</source>
         <translation>minuty</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="530"/>
+        <location filename="../qt-ui/preferences.ui" line="555"/>
         <source>Seconds</source>
         <translation>sekundy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="562"/>
+        <location filename="../qt-ui/preferences.ui" line="587"/>
         <source>Show</source>
         <translation>Pokaż</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="693"/>
         <source>Show non-used cylinders in Equipment Tab</source>
         <translation>Pokazju nieużywane butle w zakładce Wyposażenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="679"/>
+        <location filename="../qt-ui/preferences.ui" line="704"/>
         <source>show average depth</source>
         <translation>pokazuj głębokość średnią</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>GFLow na maksymalnej głębokości</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="691"/>
+        <location filename="../qt-ui/preferences.ui" line="716"/>
         <source>Misc</source>
         <translation>Różne</translation>
     </message>
@@ -2075,35 +2228,65 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
         <translation>Ustawienia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="697"/>
+        <location filename="../qt-ui/preferences.ui" line="722"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="739"/>
         <source>GFHigh</source>
         <translation>GFHigh</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="24"/>
+        <source>System proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="25"/>
+        <source>HTTP proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="26"/>
+        <source>SOCKS proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="245"/>
         <source>Restart required</source>
         <translation>Wymagane ponowne uruchomienie</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>Aby użyć nowego języka musisz ponownie uruchomić Subsurface.</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>Otwórz domyślny plik</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>Pliki Subsurface XML  (*.ssrf *.xml *.XML)</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="394"/>
+        <source>Warning</source>
+        <translation>Ostrzeżenie</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"/>
+    </message>
 </context>
 <context>
     <name>PrintDialog</name>
@@ -2244,72 +2427,72 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <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>nieznana</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>Nurkownie #%1 - %2</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>Max głębokość: %1 %2</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>Czas: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1918"/>
+        <location filename="../qt-ui/models.cpp" line="1898"/>
         <source>Gas Used:</source>
         <translation>Użyty gaz:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1920"/>
+        <location filename="../qt-ui/models.cpp" line="1900"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1922"/>
+        <location filename="../qt-ui/models.cpp" line="1902"/>
         <source>Max. CNS:</source>
         <translation>Max CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1924"/>
+        <location filename="../qt-ui/models.cpp" line="1904"/>
         <source>Weights:</source>
         <translation>Balast:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1929"/>
+        <location filename="../qt-ui/models.cpp" line="1909"/>
         <source>Notes:</source>
         <translation>Opis:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1936"/>
+        <location filename="../qt-ui/models.cpp" line="1916"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1938"/>
+        <location filename="../qt-ui/models.cpp" line="1918"/>
         <source>Buddy:</source>
         <translation>Partner:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1940"/>
+        <location filename="../qt-ui/models.cpp" line="1920"/>
         <source>Suit:</source>
         <translation>Skafander:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1942"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>Viz:</source>
         <translation>Widzialność:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1944"/>
+        <location filename="../qt-ui/models.cpp" line="1924"/>
         <source>Rating:</source>
         <translation>Ocena:</translation>
     </message>
@@ -2317,62 +2500,77 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/>
+        <source>Make first divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="906"/>
+        <source>Delete this divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="913"/>
         <source>Add Gas Change</source>
         <translation>Dodaj zmianę gazu</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>Dodaj notatkę</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>Usuń znacznik</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>Ukryj podobne znaczniki</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>Zmień nazwę</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>Odkryj wszystkie znaczniki</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>Ukrywanie wydarzeń</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>Ukyć wszystkie wydarzenia typu %1?</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>Usunąć wybrane wydarzenie?</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>%1 @ %2:%3</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>Zmień nazwę wydarzenia</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>Własna nazwa:</translation>
     </message>
@@ -2380,12 +2578,12 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <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>POWIETRZE</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>Usuń ten punkt</translation>
     </message>
@@ -2395,22 +2593,22 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="34"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation>średnia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="37"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation>min.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="40"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation>max.</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>Przesuń mapę i wskaż lokalizację dwuklikiem</translation>
     </message>
@@ -2424,9 +2622,23 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="128"/>
         <source>New starting number</source>
         <translation>Nowy numer początkowy</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="126"/>
+        <source>New number</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchBar</name>
+    <message>
+        <location filename="../qt-ui/searchbar.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ShiftImageTimesDialog</name>
@@ -2441,42 +2653,47 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
         <translation>Przesuń czasy zdjęć o</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="102"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="95"/>
+        <source>h:mm</source>
+        <translation>h:mm</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="105"/>
         <source>earlier</source>
         <translation>wcześniej</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="109"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="112"/>
         <source>later</source>
         <translation>później</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>Aby uwzględnić różnicę w ustawieniach zegarów komputera nurkowego i aparatu fotograficznego użyj aparatu do zrobienia zdjęcia komputera nurkowego, gdy ten wyświetla aktualny czas. Zgraj to zdjęcie na swój komputer i wciśnij ten przycisk.</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>Uwzględnij przesunięcie zegara aparatu fotograficznego</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>Wybierz zdjęcie komputera nurkowego (pokazujące aktualny czas)</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>Jaka data i godzina jest na zdjęciu?</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>Otwórz zdjęcie</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>Pliki graficzne (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2556,42 +2773,42 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <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>Usługa Internetowa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/>
         <source>Connecting...</source>
         <translation>Łączenie...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="421"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="419"/>
         <source>Download finished</source>
         <translation>Pobieranie zakończone</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>Błąd pobierania: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/>
         <source>Connection Error: </source>
         <translation>Błąd połączenia:</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>Niepoprawny identyfikator użytkownika!</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>Nie można przetworzyć odpowiedzi!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/>
         <source>Download Success!</source>
         <translation>Pobieranie zakończone sukcesem!</translation>
     </message>
@@ -2607,17 +2824,17 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <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>Opis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2625,7 +2842,7 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <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>Informacje</translation>
     </message>
@@ -2633,42 +2850,42 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <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>Sprawdzanie dostępności aktualizacji.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="37"/>
-        <source>&lt;h3&gt;Subsurface was unable to check for updates.&lt;/h3&gt;</source>
-        <translation>&lt;h3&gt;Nie udało się sprawdzić dostepności aktualizacji&lt;/h3&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="36"/>
+        <source>Subsurface was unable to check for updates.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
-        <source>&lt;br/&gt;&lt;b&gt;The following error occurred:&lt;/b&gt;&lt;br/&gt;</source>
-        <translation>&lt;br/&gt;&lt;b&gt;Natrafiono na nastepujący błąd:&lt;/b&gt;&lt;br/&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="41"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="43"/>
-        <source>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Please check your internet connection.&lt;/b&gt;</source>
-        <translation>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Sprawdź prosżę swoje połączenie z Internetem&lt;/b&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
     </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>Używasz najnowszej wersji Subsurface.</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>Nowa wersja Subsurface jest dostępna.&lt;br/&gt;Kliknij na:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; aby ją pobrać.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="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>&lt;b&gt;Nowsza wersja Subsurface jest dostępna.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</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>Wystapił błąd podczas sprawdzania dostępności aktualizaji.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -2676,25 +2893,163 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <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>instrukcja obsługi</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>Nie można znaleźć dokumentacji Subsurface</translation>
     </message>
 </context>
 <context>
+    <name>UserSurvey</name>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="47"/>
+        <source>Subsurface User Survey</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="79"/>
+        <source>Recreational DIver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="92"/>
+        <source>Tech Diver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="105"/>
+        <source>Interested in dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="118"/>
+        <source>I am downloading dives from supported dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="131"/>
+        <source>I am importing dives from other software / sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="144"/>
+        <source>I am manually entering dives</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="190"/>
+        <source>Please type suggestions (in English) in the following box</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="27"/>
+        <source>
+Operating System: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="30"/>
+        <source>
+CPU Architecture: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="35"/>
+        <source>
+OS CPU Architecture %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="39"/>
+        <source>
+Language: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="73"/>
+        <source>Should we ask you later?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="74"/>
+        <source>Don&apos;t ask me again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="75"/>
+        <source>Ask Later</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="76"/>
+        <source>Ask again?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <source>Submit User Survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <source>Subsurface was unable to submit the user survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="101"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="102"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="111"/>
+        <source>Survey successfully submitted.</source>
+        <translation type="unfinished"/>
+    </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>Wystapił błąd podczas sprawdzania dostępności aktualizaji.&lt;br/&gt;&lt;br/&gt;%1</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>Opis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="723"/>
+        <location filename="../qt-ui/models.cpp" line="721"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2742,12 +3097,12 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
         <translation>Wyślij</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>Przekroczony czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="279"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="277"/>
         <source>Transfering data...</source>
         <translation>Przesyłanie danych...</translation>
     </message>
@@ -2755,37 +3110,37 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <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>Rodzaj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="368"/>
+        <location filename="../qt-ui/models.cpp" line="373"/>
         <source>Weight</source>
         <translation>Balast</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>Kliknięcie tu usunie ten balast z listy.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="453"/>
+        <location filename="../qt-ui/models.cpp" line="458"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="454"/>
+        <location filename="../qt-ui/models.cpp" line="459"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="478"/>
+        <location filename="../qt-ui/models.cpp" line="483"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="484"/>
         <source>m</source>
         <translation>m</translation>
     </message>
@@ -2793,74 +3148,74 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <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>Rok 
  &gt; Miesiąc / grupa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1643"/>
         <source>Duration 
  Total</source>
         <translation>Czas trwania
 całkowity</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>
 Average</source>
         <translation>średni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>
 Shortest</source>
         <translation>najkrótszy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>
 Longest</source>
         <translation>najdłuższy</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>Głębokość (%1)
  średnia</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>minimalna</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>maksymalna</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>SAC (%1)
  średni</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>Temperatura (%1)
@@ -2870,99 +3225,92 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="58"/>
+        <location filename="../dive.c" line="87"/>
         <source>pascal</source>
         <translation>pascal</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>bar</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>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="104"/>
-        <location filename="../qt-gui.cpp" line="292"/>
-        <source>l</source>
-        <translation>l</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>cuft</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>m</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>ft</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>lbs</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>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1120"/>
+        <location filename="../dive.c" line="1237"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) lub (%s)</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>powietrze</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="170"/>
+        <location filename="../equipment.c" line="210"/>
         <source>integrated</source>
         <translation>zintegrowany</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="171"/>
+        <location filename="../equipment.c" line="211"/>
         <source>belt</source>
         <translation>pas balastowy</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="172"/>
+        <location filename="../equipment.c" line="212"/>
         <source>ankle</source>
         <translation>na kostkach</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="173"/>
+        <location filename="../equipment.c" line="213"/>
         <source>backplate weight</source>
         <translation>na płycie</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="174"/>
+        <location filename="../equipment.c" line="214"/>
         <source>clip-on</source>
         <translation>doczepiany</translation>
     </message>
@@ -2979,253 +3327,253 @@ Maximum</source>
         <translation>Maksymalna ilość kolumn danych przy imporcie CSV to %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>none</source>
         <translation>brak</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>deco stop</source>
         <translation>przystanek deco</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>rbt</source>
         <translation>pozostały czas denny</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ascent</source>
         <translation>wynurzanie</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ceiling</source>
         <translation>sufit</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>workload</source>
         <translation>wysiłek</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>transmitter</source>
         <translation>nadajnik</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>violation</source>
         <translation>naruszenie</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>bookmark</source>
         <translation>notatka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>surface</source>
         <translation>powierzchnia</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>safety stop</source>
         <translation>przystanek bezpieczeństwa</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>zmiana gazu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (voluntary)</source>
         <translation>przystanek bezpieczeństwa (opcjonalny)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (mandatory)</source>
         <translation>przystanek bezpieczeństwa (obowiązkowy)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>deepstop</source>
         <translation>deepstop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>ceiling (safety stop)</source>
         <translation>sufit (przystanek bezpieczeństwa)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>divetime</source>
         <translation>czas nurkowania</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>poniżej podłogi deco</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>maxdepth</source>
         <translation>Max głębokość</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>airtime</source>
         <translation>Pozostały czas oddychania</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>heading</source>
         <translation>kierunek</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>tissue level warning</source>
         <translation>Ostrzeżenie: poziom nasycenia tkanek</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>non stop time</source>
         <translation>czas bezdekompresyjny</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="163"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>invalid event number</source>
         <translation>niepoprawny znacznik</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>Nie udało się utworzyć parsera dla %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="411"/>
+        <location filename="../libdivecomputer.c" line="414"/>
         <source>Error registering the data</source>
         <translation>Błąd podczas przetwarzania danych</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="419"/>
+        <location filename="../libdivecomputer.c" line="422"/>
         <source>Error parsing the datetime</source>
         <translation>Błąd podczas przetwarzania daty i czasu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="438"/>
         <source>Dive %d: %s %d %04d</source>
         <translation>Nurkowanie %d: %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="440"/>
+        <location filename="../libdivecomputer.c" line="443"/>
         <source>Error parsing the divetime</source>
         <translation>Błąd podczas przetwarzania czasu nurkowania</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="449"/>
+        <location filename="../libdivecomputer.c" line="452"/>
         <source>Error parsing the maxdepth</source>
         <translation>Błąd podczas przetwarzania głębokości</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="458"/>
+        <location filename="../libdivecomputer.c" line="461"/>
         <source>Error parsing the gas mix count</source>
         <translation>Błąd podczas przetwarzania danych o ilości użytych rodzajów gazu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="470"/>
+        <location filename="../libdivecomputer.c" line="473"/>
         <source>Error obtaining water salinity</source>
         <translation>Błąd podczas przetwarzania danych o zasoleniu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error obtaining surface pressure</source>
         <translation>Błąd podczas przetwarzania danych o cienieniu atmosferycznym</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the gas mix</source>
         <translation>Błąd podczas przetwarzania danych o użytym rodzaju gazu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="493"/>
+        <location filename="../libdivecomputer.c" line="496"/>
         <source>Error parsing the samples</source>
         <translation>Błąd podczas przetwarzania próbek</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="623"/>
+        <location filename="../libdivecomputer.c" line="626"/>
         <source>Event: waiting for user action</source>
         <translation>Oczekiwanie na działanie użytkownika</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>model=%u (0x%08x), firmware=%u (0x%08x), numer seryjny=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="691"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the event handler.</source>
         <translation>Błąd rejestracji uchwytu (event handler)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="696"/>
+        <location filename="../libdivecomputer.c" line="699"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Błąd rejestracji uchwytu (cancellation handler)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="717"/>
+        <location filename="../libdivecomputer.c" line="720"/>
         <source>Dive data import error</source>
         <translation>Błąd podczas importowania danych</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="756"/>
+        <location filename="../libdivecomputer.c" line="759"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Nie można utworzyć kontekstu libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="763"/>
+        <location filename="../libdivecomputer.c" line="766"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Nie udało się otworzyć %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="462"/>
+        <location filename="../parse-xml.c" line="466"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Podejrzany skład procentowy %s
 </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>Nie udało się przetworzyć &apos;%s&apos;</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>Zapytanie bazy danych  get_events nie powiodło się.⏎
 </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>Zapytanie bazy danych get_tags nie powiodło się.
@@ -3239,111 +3587,160 @@ Maximum</source>
 </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 '%s'.
 </source>
         <translation>Błąd komunikacji z bazą danych &apos;%s&apos;.
 </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>Zapytanie bazy danych get_cylinders nie powiodło się.
 </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>Zapytanie bazy danych get_changes nie powiodło się.
 </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>Zapytanie bazy danych get_profile_sample nie powiodło się.
 </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>Nie można otworzyć arkusza stylów %s</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>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="146"/>
-        <location filename="../planner.c" line="617"/>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation>Nie znaleziono gazu %d/%d</translation>
+        <location filename="../planner.c" line="159"/>
+        <location filename="../planner.c" line="752"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="308"/>
+        <location filename="../planner.c" line="345"/>
         <source>Too many gas mixes</source>
         <translation>Zbyt wiele rodzajów gazu</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="489"/>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation>%s
-Subsurface - Plan Nurkownia
-w oparciu o GFlow = %.0f oraz GFhigh = %.0f
-
-</translation>
+        <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>OSTRZEŻENIE: TEN PLANER POSŁUGUJE SIĘ IMPLEMENTACJĄ ALGORYTMU BUHLMANNA, KTÓRA JEST NOWA I ZOSTAŁA PRZETESTOWANA W BARDZO OGRANICZONYM ZAKRESIE. ZDECYDOWANIE ODRADZAMY PLANOWANIE NURKOWANIA JEDYNIE W OPARCIU O REZULTATY DZIAŁANIA TEGO PROGRAMU.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="530"/>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Przejście do  %.*f %s w %d:%02d min - runtime %d:%02u z %s
-</translation>
+        <location filename="../planner.c" line="535"/>
+        <source>based on GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="539"/>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Pozostań na %.*f %s przez %d:%02d min - runtime %d:%02u z %s
-</translation>
+        <location filename="../planner.c" line="538"/>
+        <source>Subsurface dive plan</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="550"/>
-        <source>Switch gas to %s
-</source>
-        <translation>Zmiana gazu na %s
-</translation>
+        <location filename="../planner.c" line="542"/>
+        <source>depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="558"/>
-        <source>Gas consumption:
-</source>
-        <translation>Zużycie gazu:
-</translation>
+        <location filename="../planner.c" line="545"/>
+        <source>runtime</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="569"/>
-        <source>%.0f%s of %s
-</source>
-        <translation>%.0f%s z %s
-</translation>
+        <location filename="../planner.c" line="548"/>
+        <source>duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="551"/>
+        <source>gas</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </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"/>
     </message>
     <message>
-        <location filename="../planner.c" line="810"/>
+        <location filename="../planner.c" line="606"/>
+        <source>%3.0f%s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
+        <source>%3dmin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="629"/>
+        <source>Switch gas to %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="638"/>
+        <source>Gas consumption:</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="659"/>
+        <source>this is more gas than available in the specified cylinder!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="664"/>
+        <source>not enough reserve for gas sharing on ascent!</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="668"/>
+        <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="980"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1226"/>
+        <location filename="../profile.c" line="1250"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3352,70 +3749,69 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1229"/>
+        <location filename="../profile.c" line="1253"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1233"/>
+        <location filename="../profile.c" line="1257"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1263"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </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>SAC: %2.1fl/min
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1244"/>
+        <location filename="../profile.c" line="1268"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1246"/>
+        <location filename="../profile.c" line="1270"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1272"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="1274"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="1277"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1260"/>
+        <location filename="../profile.c" line="1284"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3424,7 +3820,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1264"/>
+        <location filename="../profile.c" line="1288"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3433,35 +3829,35 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1276"/>
+        <location filename="../profile.c" line="1300"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Przystanek bezp.: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1279"/>
+        <location filename="../profile.c" line="1303"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Przystanek bezp.: nieznany czas @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="1308"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
+        <location filename="../profile.c" line="1311"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: nieznany czas @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1291"/>
+        <location filename="../profile.c" line="1315"/>
         <source>In deco
 </source>
         <translation>dekompresja
@@ -3469,367 +3865,360 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1293"/>
+        <location filename="../profile.c" line="1317"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1297"/>
+        <location filename="../profile.c" line="1321"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %umin @ %.0f%s (obliczone)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1305"/>
+        <location filename="../profile.c" line="1329"/>
         <source>In deco (calc)
 </source>
         <translation>dekompresja (obliczone)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1307"/>
+        <location filename="../profile.c" line="1331"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1310"/>
+        <location filename="../profile.c" line="1334"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1313"/>
+        <location filename="../profile.c" line="1337"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Obliczony sufit:  %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1319"/>
+        <location filename="../profile.c" line="1343"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Tkanka %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1325"/>
+        <location filename="../profile.c" line="1349"/>
         <source>heartbeat: %d
 </source>
         <translation>tętno: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1327"/>
+        <location filename="../profile.c" line="1351"/>
         <source>bearing: %d
 </source>
         <translation>kurs: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1419"/>
+        <location filename="../profile.c" line="1443"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</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>%s %sGł:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1435"/>
+        <location filename="../profile.c" line="1459"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sGł:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1439"/>
+        <location filename="../profile.c" line="1463"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</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>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1454"/>
+        <location filename="../profile.c" line="1478"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="273"/>
+        <location filename="../qt-gui.cpp" line="281"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="276"/>
+        <location filename="../qt-gui.cpp" line="284"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="392"/>
-        <source>%1, %2 %3, %4 %5:%6</source>
-        <translation>%1, %2 %3, %4 %5:%6</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="405"/>
-        <source>%1 %2, %3
-%4:%5</source>
-        <translation>%1 %2, %3
-%4:%5</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="418"/>
+        <location filename="../qt-gui.cpp" line="417"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 dives)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="423"/>
+        <location filename="../qt-gui.cpp" line="422"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 nurkowanie)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>boat</source>
         <translation>z łodzi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>shore</source>
         <translation>z brzegu</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>drift</source>
         <translation>dryf</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>deep</source>
         <translation>głębokie</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>cavern</source>
         <translation>kawerna</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>ice</source>
         <translation>podlodowe</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>wreck</source>
         <translation>wrakowe</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>cave</source>
         <translation>jaskiniowe</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>altitude</source>
         <translation>wysokość</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>pool</source>
         <translation>basen</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>lake</source>
         <translation>jezioro</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>river</source>
         <translation>rzeka</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>night</source>
         <translation>nocne</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>fresh</source>
         <translation>słodka</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>student</source>
         <translation>uczeń</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>photo</source>
         <translation>fotografia</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>video</source>
         <translation>video</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>instructor</source>
         <translation>instruktor</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="25"/>
         <source>deco</source>
         <translation>deco</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="216"/>
+        <location filename="../dive.c" line="133"/>
+        <source>ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="214"/>
         <source>more than %d days</source>
         <translation>więcej niż %d dni</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="220"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="224"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="235"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation>dla nurkowania nr</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="242"/>
+        <location filename="../statistics.c" line="240"/>
         <source>for selected dives</source>
         <translation>dla wybranych nurkowań</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="275"/>
         <source>for dive #%d</source>
         <translation>dla nurkowania #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for selected dive</source>
         <translation>dla wybranego nurkowania</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for all dives</source>
         <translation>dla wszystkich nurkowań</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="283"/>
+        <location filename="../statistics.c" line="281"/>
         <source>(no dives)</source>
         <translation>(brak nurkowań)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sun</source>
         <translation>Nie</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Mon</source>
         <translation>Pon</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Tue</source>
         <translation>Wto</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Wed</source>
         <translation>Śro</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Thu</source>
         <translation>Czw</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Fri</source>
         <translation>Pią</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sat</source>
         <translation>Sob</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jan</source>
         <translation>Sty</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Feb</source>
         <translation>Lut</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Apr</source>
         <translation>Kwi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>May</source>
         <translation>Maj</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jun</source>
         <translation>Cze</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Jul</source>
         <translation>Lip</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Aug</source>
         <translation>Sie</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Sep</source>
         <translation>Wrz</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Oct</source>
         <translation>Paź</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Nov</source>
         <translation>Lis</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Dec</source>
         <translation>Gru</translation>
     </message>
@@ -3859,97 +4248,97 @@ Is the Uemis Zurich plugged in correctly?</source>
 Czy Uemis Zurich jest podłączony poprawnie?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="107"/>
+        <location filename="../uemis-downloader.c" line="111"/>
         <source>unknown</source>
         <translation>nieznana</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="379"/>
+        <location filename="../uemis-downloader.c" line="383"/>
         <source>Reading %s %s</source>
         <translation>Czytanie %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="399"/>
+        <location filename="../uemis-downloader.c" line="403"/>
         <source>data</source>
         <translation>dane</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="420"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>divelog entry id</source>
         <translation>wpis dziennika nurkowego id</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="422"/>
+        <location filename="../uemis-downloader.c" line="426"/>
         <source>divespot data id</source>
         <translation>dane o miejscu nurkowania</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
+        <location filename="../uemis-downloader.c" line="428"/>
         <source>more data dive id</source>
         <translation>dane nurkowania id</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>wetsuit</source>
         <translation>mokry</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>semidry</source>
         <translation>półsuchy</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>drysuit</source>
         <translation>suchy</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>shorty</source>
         <translation>krótki</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>vest</source>
         <translation>kamizelka</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>long john</source>
         <translation>długi</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>jacket</source>
         <translation>kurtka</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>full suit</source>
         <translation>pełna</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>2 pcs full suit</source>
         <translation>pełna dwuczęściowa</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="620"/>
+        <location filename="../uemis-downloader.c" line="624"/>
         <source>membrane</source>
         <translation>membranowy</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="802"/>
+        <location filename="../uemis-downloader.c" line="823"/>
         <source>Init Communication</source>
         <translation>Nawiązywanie łączności</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="804"/>
+        <location filename="../uemis-downloader.c" line="825"/>
         <source>Uemis init failed</source>
         <translation>Błąd inicjalizacji Uemis </translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="815"/>
+        <location filename="../uemis-downloader.c" line="836"/>
         <source>Start download</source>
         <translation>Rozpocznij pobieranie</translation>
     </message>
@@ -3970,18 +4359,18 @@ Czy Uemis Zurich jest podłączony poprawnie?</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="203"/>
-        <source>PO2 Green Warning</source>
-        <translation>Ostrzeżenie: PO2 zielone</translation>
+        <source>pO₂ Green Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
-        <source>PO2 Ascend Warning</source>
-        <translation>Ostrzeżenie: wynurzanie / PO2</translation>
+        <source>pO₂ Ascend Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="208"/>
-        <source>PO2 Ascend Alarm</source>
-        <translation>Alarm: wynurzanie / PO2 </translation>
+        <source>pO₂ Ascend Alarm</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
@@ -4043,5 +4432,214 @@ Czy Uemis Zurich jest podłączony poprawnie?</translation>
         <source>Low Battery Alert</source>
         <translation>Alarm: niski poziom baterii</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"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="36"/>
+        <source>Date:</source>
+        <translation>Data:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="38"/>
+        <source>Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="40"/>
+        <source>Duration:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="41"/>
+        <source>min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="43"/>
+        <source>Max Depth:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="46"/>
+        <source>Air Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="48"/>
+        <source>Water Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="50"/>
+        <source>Location:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="54"/>
+        <source>Notes:</source>
+        <translation>Opis:</translation>
+    </message>
+</context>
+<context>
+    <name>plannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="35"/>
+        <source>Rates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="56"/>
+        <source>Ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="77"/>
+        <source>below 75% avg. depth</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="94"/>
+        <source>75%-50% avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="111"/>
+        <source>50% avg. depth - 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="128"/>
+        <source>6m/20ft to surface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="148"/>
+        <source>Descent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="200"/>
+        <source>surface to the bottom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="226"/>
+        <source>Planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="247"/>
+        <source>GF low</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="264"/>
+        <source>GF high</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
+        <source>Drop to first depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
+        <source>Last Stop at 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>plan backgas breaks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="318"/>
+        <source>Gas Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <source>bottom SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="349"/>
+        <source>deco SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="359"/>
+        <source>bottom pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="389"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="382"/>
+        <source>deco pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="421"/>
+        <source>Dive Notes</source>
+        <translation>Opis nurkowania</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="445"/>
+        <source>display runtime</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="458"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="461"/>
+        <source>display segment duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="471"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="474"/>
+        <source>display transitions in deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="481"/>
+        <source>verbatim diveplan</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_pt_BR.ts b/translations/subsurface_pt_BR.ts
index e88d9db01..150c7b24e 100644
--- a/translations/subsurface_pt_BR.ts
+++ b/translations/subsurface_pt_BR.ts
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="pt_BR">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_BR" version="2.0">
+<defaultcodec>UTF-8</defaultcodec>
 <context>
     <name>CylindersModel</name>
     <message>
@@ -39,42 +38,42 @@
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="71"/>
+        <location filename="../qt-ui/models.cpp" line="70"/>
         <source>Switch at</source>
         <translation>Trocar aos</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>Ao clicar aqui irá eliminar este cilindro.</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>Cilindro não pode ser eliminado</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>Esta mistura está sendo usada. Apenas cilindros que não estão em uso no mergulho podem ser removidos.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="507"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="508"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="527"/>
+        <location filename="../qt-ui/models.cpp" line="532"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="528"/>
+        <location filename="../qt-ui/models.cpp" line="533"/>
         <source>cuft</source>
         <translation>pés cúbicos</translation>
     </message>
@@ -102,22 +101,22 @@ o computador de mergulho selecionado?</translation>
 <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>Modelo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Device ID</source>
         <translation>ID do dispositivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Nickname</source>
         <translation>Apelido</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>Ao clicar aqui irá remover este computador de mergulho.</translation>
     </message>
@@ -125,190 +124,326 @@ o computador de mergulho selecionado?</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="90"/>
-        <source>air</source>
-        <translation>ar</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="92"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</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>Troca de emergência para circuito aberto</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>início</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>fim</translation>
     </message>
 </context>
 <context>
-    <name>DiveGasPressureItem</name>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="475"/>
-        <source>air</source>
-        <translation>ar</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="476"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-</context>
-<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1258"/>
-        <source> l/min</source>
-        <translation>l/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
-        <source> cuft/min</source>
-        <translation>pés cúbicos/min</translation>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <source>/min</source>
+        <translation>/min</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>Mostrar caixa de pesquisa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="706"/>
         <source>expand all</source>
         <translation>expandir todos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="740"/>
+        <location filename="../qt-ui/divelistview.cpp" line="707"/>
         <source>collapse all</source>
         <translation>colapsar todos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="741"/>
+        <location filename="../qt-ui/divelistview.cpp" line="708"/>
         <source>collapse others</source>
         <translation>colapsar outros</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>remover mergulho(s) desta viagem</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>criar nova viagem acima</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>adicionar mergulho(s) à viagem imediatamente acima</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>
+        <translation type="unfinished"/>
     </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>mesclar viagem com a viagem acima</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>mesclar viagem com a viagem abaixo</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>apagar mergulho(s)</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>marcar mergulho(s) como inválido(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
-        <source>save As</source>
-        <translation>salvar como</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="744"/>
+        <source>renumber dive(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="763"/>
-        <source>export As UDDF</source>
-        <translation>exportar como UDDF</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <source>shift times</source>
+        <translation>deslocar os tempos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="764"/>
-        <source>export As CSV</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <source>load images</source>
+        <translation>carregar imagens</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="765"/>
-        <source>shift times</source>
-        <translation>deslocar os tempos</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Open Image Files</source>
+        <translation>Abrir arquivos de imagens</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="766"/>
-        <source>load images</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation>Arquivos de imagens (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <source>merge selected dives</source>
+        <translation>mesclar mergulhos selecionados</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="769"/>
-        <source>upload dive(s) to divelogs.de</source>
-        <translation>enviar mergulho(s) para divelogs.de</translation>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="24"/>
+        <source>General Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="30"/>
+        <source>Export format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="42"/>
+        <source>Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="61"/>
+        <source>UDDF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="74"/>
+        <source>divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="84"/>
+        <source>CSV</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="94"/>
+        <source>Worldmap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="107"/>
+        <source>Selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="116"/>
+        <source>Selected dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="126"/>
+        <source>All dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="178"/>
+        <source>HTML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="184"/>
+        <source>General Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="190"/>
+        <source>Subsurface Numbers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="203"/>
+        <source>Selected Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="216"/>
+        <source>Minimum Javascript</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="229"/>
+        <source>All Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="239"/>
+        <source>Export List only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="252"/>
+        <source>Style Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="264"/>
+        <source>Font</source>
+        <translation>Fonte</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="274"/>
+        <source>Font size</source>
+        <translation>Tamanho da fonte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="795"/>
-        <source>Save Dives As...</source>
-        <translation>Gravar mergulhos como...</translation>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
+        <source>8</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="814"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <source>10</source>
+        <translation>10</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <source>12</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <source>14</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <source>16</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <source>18</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <source>20</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="323"/>
+        <source>Theme</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <source>Sand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="153"/>
         <source>Export UDDF File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>Arquivos UDDF  (*.uddf *.UDDF)</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Open Image Files</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="162"/>
+        <source>Export World Map</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="163"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="177"/>
+        <source>HTML files (*.html)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="760"/>
-        <source>merge selected dives</source>
-        <translation>mesclar mergulhos selecionados</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="167"/>
+        <source>Export Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="168"/>
+        <source>XML files (*.xml *.ssrf)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="176"/>
+        <source>Export HTML files as</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -316,141 +451,136 @@ o computador de mergulho selecionado?</translation>
     <message>
         <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
         <source>Import dive log file</source>
-        <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>
+        <translation>Importar arquivo com log de mergulho</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>
+        <translation>Opções CSV</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>Separador de campos</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>Importações pré-definidas</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>Configuração de campos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="80"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="100"/>
         <source>Stopdepth</source>
         <translation>Profundidade da parada</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="107"/>
         <source>PO2</source>
         <translation>PO2</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>Horário</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="121"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="151"/>
         <source>Cns</source>
         <translation>CNS</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>Unidades</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>Métrico</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>Imperial</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>
+        <translation>Mergulhos manuais</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>
+        <translation>Mergulho nº</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="317"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="385"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="470"/>
         <source>Tags</source>
         <translation>Rótulos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
         <source>Location</source>
         <translation>Local</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>
+        <translation>GPS</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>
+        <translation>Profundidade máxima</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>
+        <translation>Profundidade média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="368"/>
         <source>Buddy</source>
         <translation>Parceiro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="402"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="436"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
@@ -458,105 +588,70 @@ o computador de mergulho selecionado?</translation>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="71"/>
-        <source>Bottom SAC</source>
-        <translation>SAC no fundo</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="85"/>
-        <source>SAC on DECO Stop</source>
-        <translation>SAC na parada de descompressão</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="106"/>
+        <source>Planned Dive Time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="78"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="134"/>
+        <source>Altitude</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="98"/>
-        <source>GFLow</source>
-        <translation>GFlow</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="125"/>
-        <source>Last Stop at 6m</source>
-        <translation>Última parada aos 6m</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="174"/>
-        <source>Start Time</source>
-        <translation>Horário de início</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="181"/>
+        <location filename="../qt-ui/diveplanner.ui" line="141"/>
         <source>ATM Pressure</source>
         <translation>Pressão em ATM</translation>
     </message>
-</context>
-<context>
-    <name>DivePlannerGraphics</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="114"/>
-        <source>10m</source>
-        <translation>10m</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="148"/>
+        <source>mbar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="116"/>
-        <source>30ft</source>
-        <translation>30 pés</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="363"/>
-        <source>Handler Position Error</source>
-        <translation>Erro na posição</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>
-        <translation>Uma ou mais paradas de deco serão eliminadas com estas operações.
-Por favor, remova-as primeiro.</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="158"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="445"/>
-        <source>AIR</source>
-        <translation>AR</translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="137"/>
+        <source>unknown</source>
+        <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1148"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="586"/>
         <source>Final Depth</source>
         <translation>Profundidade final</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1152"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="590"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1154"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="592"/>
         <source>Used Gas</source>
         <translation>Gás utilizado</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>CC Set Point</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>Descartar o planejamento?</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>Você está prestes a eliminar seu planejamento.</translation>
     </message>
@@ -564,17 +659,17 @@ Por favor, remova-as primeiro.</translation>
 <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>Pontos do plano de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="256"/>
         <source>Available Gases</source>
         <translation>Gases disponíveis</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>adicionar ponto ao mergulho</translation>
     </message>
@@ -604,118 +699,118 @@ Por favor, remova-as primeiro.</translation>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/>
         <source>Color</source>
-        <translation type="unfinished"></translation>
+        <translation>Cor</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
         <source>User Entered</source>
-        <translation type="unfinished"></translation>
+        <translation>Alimentado pelo usuário</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
         <source>Cylinder Index</source>
-        <translation type="unfinished"></translation>
+        <translation>Índice do cilindro</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
-        <source>Pressure  S</source>
-        <translation type="unfinished"></translation>
+        <source>Pressure S</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <source>pN₂</source>
+        <translation>pN₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>pHe</source>
+        <translation>pHe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Pressure I</source>
-        <translation type="unfinished"></translation>
+        <translation>Pressão I</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
         <source>Ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation>Teto</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
-        <source>PN2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <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="119"/>
-        <source>PO2</source>
-        <translation>PO2</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>nº</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>date</source>
         <translation>data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>ft</source>
         <translation>pé(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1298"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
+        <location filename="../qt-ui/models.cpp" line="1307"/>
         <source>suit</source>
         <translation>roupa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1310"/>
         <source>cyl</source>
         <translation>cilindro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1344"/>
+        <location filename="../qt-ui/models.cpp" line="1325"/>
         <source>location</source>
         <translation>local</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1316"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1338"/>
+        <location filename="../qt-ui/models.cpp" line="1319"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1341"/>
+        <location filename="../qt-ui/models.cpp" line="1322"/>
         <source>maxCNS</source>
         <translation>CNS máx</translation>
     </message>
@@ -723,115 +818,115 @@ Por favor, remova-as primeiro.</translation>
 <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>Resposta inválida do servidor</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>Esperava rótulo XML &apos;DiveDateReader&apos;, recebido &apos;%1</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>Rótulo XML &apos;DiveDates&apos; esperado não foi encontrado</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>Resposta XML defeituosa. Linha %1: %2</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>nenhum mergulho selecionado</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="181"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="179"/>
         <source>internal error</source>
         <translation>erro interno</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>Finalizado</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>Enviando lista de mergulhos...</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>Recebendo lista de mergulhos...</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>Recebendo %1 mergulhos...</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>Recebimento terminado - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
         <source>Corrupted download</source>
         <translation>Recebimento inválido</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>O arquivo não pode ser aberto:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Upload failed</source>
         <translation>Envio falhou</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="849"/>
         <source>Upload successful</source>
         <translation>Envio bem sucedido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="854"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="852"/>
         <source>Login failed</source>
         <translation>Abertura de sessão (login) falhou</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>Falha na análise da resposta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="868"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Error: %1</source>
         <translation>Erro: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="835"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/>
         <source>Upload finished</source>
         <translation>Enviado finalizado</translation>
     </message>
@@ -839,54 +934,54 @@ Por favor, remova-as primeiro.</translation>
 <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>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="165"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/>
         <source>Error</source>
         <translation>Erro</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>Tentar novamente</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>
+        <translation>Encontrar computador de mergulho Uemis</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>Escolha o arquivo para recebimento do arquivo de log do computador de mergulho</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>Arquivos de log (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="339"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
         <source>Warning</source>
         <translation>Aviso</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>Ao salvar a saída da biblioteca libdivecomputer as informações dos mergulhos recebidos NÃO serão gravadas na lista de mergulhos.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="351"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="352"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Escolha o arquivo onde gravar a saída binária do computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="353"/>
         <source>Dump files (*.bin)</source>
         <translation>Arquivos de saída (*.bin)</translation>
     </message>
@@ -954,7 +1049,7 @@ Por favor, remova-as primeiro.</translation>
 <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>Editar pontos de mergulho selecionados</translation>
     </message>
@@ -963,845 +1058,851 @@ Por favor, remova-as primeiro.</translation>
     <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>Notas do mergulho</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>Local</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="148"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Coordinates</source>
         <translation>Coordenadas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="169"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="155"/>
+        <location filename="../qt-ui/maintab.ui" line="148"/>
         <source>Buddy</source>
         <translation>Parceiro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="63"/>
-        <source>Start time</source>
-        <translation>Horário de início</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>Temp ambiente</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>Temp da água</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="127"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Tags</source>
         <translation>Rótulos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="223"/>
         <source>Rating</source>
         <translation>Classificação</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="236"/>
         <source>Visibility</source>
         <translation>Visibilidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="215"/>
+        <location filename="../qt-ui/maintab.ui" line="127"/>
         <source>Suit</source>
         <translation>Roupa</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>Notas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="270"/>
+        <location filename="../qt-ui/maintab.ui" line="311"/>
         <source>Equipment</source>
         <translation>Equipamento</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="350"/>
+        <location filename="../qt-ui/maintab.ui" line="391"/>
         <source>Dive Info</source>
         <translation>Info do mergulho</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>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="414"/>
+        <location filename="../qt-ui/maintab.ui" line="275"/>
+        <source>Time</source>
+        <translation>Horário</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="455"/>
         <source>Interval</source>
         <translation>Intervalo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="433"/>
+        <location filename="../qt-ui/maintab.ui" line="474"/>
         <source>Gases Used</source>
         <translation>Gases utilizados</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="452"/>
+        <location filename="../qt-ui/maintab.ui" line="493"/>
         <source>Gas Consumed</source>
         <translation>Gás consumido</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>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="531"/>
         <source>Max. Depth</source>
         <translation>Profundidade máxima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="509"/>
+        <location filename="../qt-ui/maintab.ui" line="550"/>
         <source>Ave. Depth</source>
         <translation>Profundidade Média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="528"/>
+        <location filename="../qt-ui/maintab.ui" line="569"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="547"/>
+        <location filename="../qt-ui/maintab.ui" line="588"/>
         <source>Air Pressure</source>
         <translation>Pressão do Ar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="566"/>
+        <location filename="../qt-ui/maintab.ui" line="607"/>
         <source>Air Temperature</source>
         <translation>Temperatura ambiente</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="585"/>
+        <location filename="../qt-ui/maintab.ui" line="626"/>
         <source>Water Temperature</source>
         <translation>Temperatura da água</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="604"/>
+        <location filename="../qt-ui/maintab.ui" line="645"/>
         <source>Dive Time</source>
         <translation>Tempo de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="623"/>
+        <location filename="../qt-ui/maintab.ui" line="664"/>
         <source>Salinity</source>
         <translation>Salinidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="660"/>
+        <location filename="../qt-ui/maintab.ui" line="701"/>
         <source>Stats</source>
         <translation>Estatísticas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="746"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="784"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Total Time</source>
         <translation>Tempo total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="835"/>
         <source>Dives</source>
         <translation>Mergulhos</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="919"/>
+        <source>Photos</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="89"/>
         <source>Cylinders</source>
         <translation>Cilindros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="90"/>
         <source>Add Cylinder</source>
         <translation>Adicionar cilindro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="93"/>
         <source>Weights</source>
         <translation>Lastro</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>Adicionar sistema de lastro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="438"/>
+        <location filename="../qt-ui/maintab.cpp" line="409"/>
         <source>Trip Location</source>
         <translation>Local da viagem</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>Notas sobre a viagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="42"/>
+        <location filename="../qt-ui/maintab.cpp" line="48"/>
         <source>Save</source>
         <translation>Salvar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="46"/>
+        <location filename="../qt-ui/maintab.cpp" line="52"/>
         <source>Cancel</source>
         <translation>Cancelar</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>Esta viagem está sendo editada.</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>Vários mergulhos estão sendo editados.</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>Este mergulho está sendo editado.</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>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="494"/>
+        <location filename="../qt-ui/maintab.cpp" line="464"/>
         <source>unknown</source>
         <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>N</source>
-        <translation>N</translation>
+        <location filename="../qt-ui/maintab.cpp" line="501"/>
+        <source>Deepest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>S</source>
-        <translation>S</translation>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <source>Shallowest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>E</source>
-        <translation>L</translation>
+        <location filename="../qt-ui/maintab.cpp" line="794"/>
+        <source>Discard the Changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>W</source>
-        <translation>O</translation>
+        <location filename="../qt-ui/maintab.cpp" line="795"/>
+        <source>You are about to discard your changes.</source>
+        <translation type="unfinished"/>
     </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>Filtro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="571"/>
+        <location filename="../qt-ui/mainwindow.ui" line="646"/>
         <source>&amp;File</source>
         <translation>A&amp;rquivo</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="583"/>
+        <source>Print</source>
+        <translation>Imprimir</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:'Courier'; 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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="606"/>
+        <location filename="../qt-ui/mainwindow.ui" line="679"/>
         <source>&amp;View</source>
         <translation>&amp;Ver</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="628"/>
+        <location filename="../qt-ui/mainwindow.ui" line="701"/>
         <source>&amp;Help</source>
         <translation>&amp;Ajuda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="636"/>
+        <location filename="../qt-ui/mainwindow.ui" line="709"/>
         <source>&amp;Import</source>
         <translation>&amp;Importar</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>&amp;Novo logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="655"/>
+        <location filename="../qt-ui/mainwindow.ui" line="728"/>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="658"/>
+        <location filename="../qt-ui/mainwindow.ui" line="731"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</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>&amp;Abrir logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="666"/>
+        <location filename="../qt-ui/mainwindow.ui" line="739"/>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <location filename="../qt-ui/mainwindow.ui" line="742"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="674"/>
+        <location filename="../qt-ui/mainwindow.ui" line="747"/>
         <source>&amp;Save</source>
         <translation>&amp;Gravar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="677"/>
+        <location filename="../qt-ui/mainwindow.ui" line="750"/>
         <source>Save</source>
         <translation>Salvar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="680"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>Save as</source>
         <translation>Salvar como</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>Ctrl+Shift+S</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>Fe&amp;char</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="702"/>
+        <location filename="../qt-ui/mainwindow.ui" line="775"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="902"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <source>P&amp;references</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="831"/>
+        <source>&amp;Add Dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <source>Auto &amp;Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="863"/>
+        <source>&amp;Dive List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="871"/>
+        <source>&amp;Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="879"/>
+        <source>&amp;Info</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="887"/>
+        <source>&amp;All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="895"/>
+        <source>P&amp;rev DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="903"/>
+        <source>&amp;Next DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="911"/>
+        <source>&amp;Select Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <source>&amp;About Subsurface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="937"/>
+        <source>&amp;Globe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="953"/>
+        <source>&amp;Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="959"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="707"/>
-        <source>Export &amp;UDDF</source>
-        <translation>Exportar %UDDF</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="1008"/>
+        <source>&amp;Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1011"/>
+        <source>Export Dive Logs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1014"/>
+        <source>Ctrl+E</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Enable the pN2 Graph</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <location filename="../qt-ui/mainwindow.ui" line="128"/>
         <source>Enable the pHe graph</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <location filename="../qt-ui/mainwindow.ui" line="290"/>
         <source>Show/hide heart rate</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <location filename="../qt-ui/mainwindow.ui" line="342"/>
         <source>Enable EAD, END, and EADD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="238"/>
         <source>Show NDL / TTS</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="456"/>
+        <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="710"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="715"/>
-        <source>Export HTML World Map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="718"/>
-        <source>Ctrl+H</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="723"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>&amp;Print</source>
         <translation>&amp;Imprimir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="734"/>
+        <location filename="../qt-ui/mainwindow.ui" line="791"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="742"/>
+        <location filename="../qt-ui/mainwindow.ui" line="799"/>
         <source>&amp;Quit</source>
         <translation>%Fechar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="753"/>
+        <location filename="../qt-ui/mainwindow.ui" line="810"/>
         <source>Import from &amp;dive computer</source>
         <translation>Importar do &amp;computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="818"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation>Importar informações &amp;GPS do serviço Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="764"/>
+        <location filename="../qt-ui/mainwindow.ui" line="821"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="826"/>
         <source>&amp;Edit Device Names</source>
         <translation>%Editar nomes dos dispositivos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="834"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="782"/>
+        <location filename="../qt-ui/mainwindow.ui" line="839"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Renumerar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="785"/>
+        <location filename="../qt-ui/mainwindow.ui" line="842"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="798"/>
+        <location filename="../qt-ui/mainwindow.ui" line="855"/>
         <source>&amp;Yearly Statistics</source>
         <translation>&amp;Estatísticas anuais</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="801"/>
+        <location filename="../qt-ui/mainwindow.ui" line="858"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="806"/>
-        <source>Dive List</source>
-        <translation>Lista de mergulhos</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="814"/>
-        <source>Profile</source>
-        <translation>Perfil</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="822"/>
-        <source>Info</source>
-        <translation>Info</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="830"/>
-        <source>All</source>
-        <translation>Tudo</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="872"/>
+        <location filename="../qt-ui/mainwindow.ui" line="929"/>
         <source>User &amp;Manual</source>
         <translation>&amp;Manual do usuário</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="880"/>
-        <source>Globe</source>
-        <translation>Globo</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="888"/>
+        <location filename="../qt-ui/mainwindow.ui" line="945"/>
         <source>P&amp;lan Dive</source>
         <translation>P&amp;lanejar mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="891"/>
+        <location filename="../qt-ui/mainwindow.ui" line="948"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="907"/>
-        <source>Import from Divelogs.de</source>
-        <translation>Importar de Divelogs.de</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1003"/>
         <source>&amp;Check for Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="951"/>
-        <source>Export CSV</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="726"/>
+        <location filename="../qt-ui/mainwindow.ui" line="783"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</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"/>
+        <translation>Habilitar PO2 no gráfico</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="131"/>
+        <location filename="../qt-ui/mainwindow.ui" line="157"/>
+        <location filename="../qt-ui/mainwindow.ui" line="186"/>
+        <location filename="../qt-ui/mainwindow.ui" line="215"/>
+        <location filename="../qt-ui/mainwindow.ui" line="241"/>
+        <location filename="../qt-ui/mainwindow.ui" line="267"/>
+        <location filename="../qt-ui/mainwindow.ui" line="293"/>
+        <location filename="../qt-ui/mainwindow.ui" line="319"/>
+        <location filename="../qt-ui/mainwindow.ui" line="345"/>
+        <location filename="../qt-ui/mainwindow.ui" line="371"/>
+        <location filename="../qt-ui/mainwindow.ui" line="397"/>
+        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>...</source>
         <translation>...</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>
+        <translation>Habilitar PMO</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>
+        <translation>Mostrar o teto reportado pelo computador de mergulho</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>
+        <translation>Mostrar o teto calculado</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>
+        <translation>Mostrar o teto calculado em incrementos de 3 m</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>
+        <translation>Calcular todos os tecidos</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>
+        <translation type="unfinished"/>
     </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>Preferências</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="745"/>
+        <location filename="../qt-ui/mainwindow.ui" line="802"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="756"/>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="774"/>
-        <source>Add Dive</source>
-        <translation>Adicionar mergulho</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="793"/>
-        <source>Auto Group</source>
-        <translation>Agrupar automaticamente</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="809"/>
+        <location filename="../qt-ui/mainwindow.ui" line="866"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="817"/>
+        <location filename="../qt-ui/mainwindow.ui" line="874"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <location filename="../qt-ui/mainwindow.ui" line="882"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="833"/>
+        <location filename="../qt-ui/mainwindow.ui" line="890"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="838"/>
-        <source>Prev DC</source>
-        <translation>Computador de mergulho anterior</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="841"/>
+        <location filename="../qt-ui/mainwindow.ui" line="898"/>
         <source>Left</source>
         <translation>Esquerda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="846"/>
-        <source>Next DC</source>
-        <translation>Computador de mergulho seguinte</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="849"/>
+        <location filename="../qt-ui/mainwindow.ui" line="906"/>
         <source>Right</source>
         <translation>Direita</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="854"/>
-        <source>Select Events</source>
-        <translation>Selecionar eventos</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <location filename="../qt-ui/mainwindow.ui" line="916"/>
         <source>Input Plan</source>
         <translation>Introduzir Plano</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="864"/>
-        <source>About Subsurface</source>
-        <translation>Sobre o Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="875"/>
+        <location filename="../qt-ui/mainwindow.ui" line="932"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="883"/>
+        <location filename="../qt-ui/mainwindow.ui" line="940"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="896"/>
-        <source>Import Log Files</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/mainwindow.ui" line="956"/>
+        <source>Import divelog files from other applications</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="899"/>
-        <source>Import divelog files from other applications</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/mainwindow.ui" line="964"/>
+        <source>Import &amp;from Divelogs.de</source>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <location filename="../qt-ui/mainwindow.ui" line="978"/>
         <source>F11</source>
-        <translation type="unfinished">F11</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="174"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
         <source>Open File</source>
         <translation>Abrir arquivo</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>Por favor, salve ou cancele a edição atual do mergulho antes de fechar o arquivo.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="330"/>
-        <source>Please save or cancel the current dive edit before trying to plan a dive.</source>
-        <translation>Por favor salve ou cancele a edição atual do mergulho antes de iniciar um planejamento de mergulho.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="396"/>
+        <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>Por favor, salve ou cancele a edição atual do mergulho atual antes de tentar adicionar um mergulho.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="645"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="419"/>
+        <source>Print runtime table</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="710"/>
         <source>Do you want to save the changes you made in the file %1?</source>
         <translation>Deseja gravar as alterações feitas no arquivo %1?</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>Deseja gravar as alterações feitas no arquivo de dados?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="652"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="717"/>
         <source>Save Changes?</source>
         <translation>Salvar alterações?</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>As alterações serão perdidas se não forem gravadas.</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>Salvar aquivo como</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>Aviso</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>Por favor, salve ou cancele a edição atual do mergulho antes de abrir um novo arquivo.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="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>Arquivos UDDF  (*.uddf *.UDDF)</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>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="300"/>
-        <source>HTML files (*.html)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="449"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="514"/>
         <source>Yearly Statistics</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="961"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1076"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Arquivos XML do Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1199"/>
         <source>Open Dive Log File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1107"/>
+        <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>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PlannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Last stop at 20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="416"/>
+        <source>Last stop at 6m</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1827,247 +1928,297 @@ Por favor, remova-as primeiro.</translation>
         <translation>Língua</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="151"/>
         <source>Lists and Tables</source>
         <translation>Listas e tabelas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font</source>
         <translation>Fonte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="167"/>
         <source>Font size</source>
         <translation>Tamanho da fonte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="170"/>
+        <location filename="../qt-ui/preferences.ui" line="180"/>
         <source>Dives</source>
         <translation>Mergulhos</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>Arquivo padrão de mergulhos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="188"/>
+        <location filename="../qt-ui/preferences.ui" line="198"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="197"/>
+        <location filename="../qt-ui/preferences.ui" line="207"/>
         <source>Display Invalid</source>
         <translation>Mostrar inválidos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="214"/>
+        <location filename="../qt-ui/preferences.ui" line="224"/>
         <source>Default Cylinder</source>
         <translation>Cilindro padrão</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>Usar cilindro padrão</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <source>Clear all settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="312"/>
+        <source>Reset all settings to their default value</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
         <source>System</source>
         <translation>Sistema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="348"/>
         <source>Metric</source>
         <translation>Métrico</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="333"/>
+        <location filename="../qt-ui/preferences.ui" line="358"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="343"/>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
         <source>Personalize</source>
         <translation>Personalizar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="392"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="374"/>
+        <location filename="../qt-ui/preferences.ui" line="399"/>
         <source>meter</source>
         <translation>metro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="409"/>
         <source>feet</source>
         <translation>pé</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="401"/>
+        <location filename="../qt-ui/preferences.ui" line="426"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="411"/>
+        <location filename="../qt-ui/preferences.ui" line="436"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="428"/>
+        <location filename="../qt-ui/preferences.ui" line="453"/>
         <source>liter</source>
         <translation>litro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="438"/>
+        <location filename="../qt-ui/preferences.ui" line="463"/>
         <source>cu ft</source>
         <translation>pé cúbico</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="455"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="465"/>
+        <location filename="../qt-ui/preferences.ui" line="490"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="482"/>
+        <location filename="../qt-ui/preferences.ui" line="507"/>
         <source>kg</source>
         <translation>kg</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="811"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="817"/>
+        <source>Proxy type</source>
+        <translation type="unfinished"/>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="636"/>
-        <source>max ppO₂ when showing MOD</source>
-        <translation type="unfinished"></translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="830"/>
+        <source>Host</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="856"/>
+        <source>Port</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="657"/>
+        <location filename="../qt-ui/preferences.ui" line="882"/>
+        <source>Requires authentication</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="925"/>
+        <source>Password</source>
+        <translation>Senha</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="682"/>
         <source>draw dive computer reported ceiling red</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="747"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>System Default</source>
         <translation>Padrão do Sistema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="767"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>Filter</source>
         <translation>Filtro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="419"/>
         <source>Pressure</source>
         <translation>Pressão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="421"/>
+        <location filename="../qt-ui/preferences.ui" line="446"/>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="448"/>
+        <location filename="../qt-ui/preferences.ui" line="473"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="475"/>
+        <location filename="../qt-ui/preferences.ui" line="500"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="517"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="507"/>
+        <location filename="../qt-ui/preferences.ui" line="532"/>
         <source>Time units</source>
         <translation>Unidades de tempo</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>Denominador da velocidade de subida/descida</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="520"/>
+        <location filename="../qt-ui/preferences.ui" line="545"/>
         <source>Minutes</source>
         <translation>Minutos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="530"/>
+        <location filename="../qt-ui/preferences.ui" line="555"/>
         <source>Seconds</source>
         <translation>Segundos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="562"/>
+        <location filename="../qt-ui/preferences.ui" line="587"/>
         <source>Show</source>
         <translation>Mostrar</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="693"/>
         <source>Show non-used cylinders in Equipment Tab</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>GFlow à profundidade máxima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="691"/>
+        <location filename="../qt-ui/preferences.ui" line="716"/>
         <source>Misc</source>
         <translation>Diversos</translation>
     </message>
@@ -2077,35 +2228,65 @@ Por favor, remova-as primeiro.</translation>
         <translation>Preferências</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="697"/>
+        <location filename="../qt-ui/preferences.ui" line="722"/>
         <source>GFLow</source>
         <translation>GFlow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="739"/>
         <source>GFHigh</source>
         <translation>GFHigh</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="24"/>
+        <source>System proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="25"/>
+        <source>HTTP proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="26"/>
+        <source>SOCKS proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="245"/>
         <source>Restart required</source>
         <translation>Reinicialização necessária</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>Para carregar corretamente uma nova língua você deve reiniciar o Subsurface.</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>Abrir o logbook padrão</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>Arquivos XML do Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="394"/>
+        <source>Warning</source>
+        <translation>Aviso</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"/>
+    </message>
 </context>
 <context>
     <name>PrintDialog</name>
@@ -2246,72 +2427,72 @@ Por favor, remova-as primeiro.</translation>
 <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>desconhecido</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>Mergulho #%1 - %2</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>Profundidade máxima: %1 %2</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>Duração: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1918"/>
+        <location filename="../qt-ui/models.cpp" line="1898"/>
         <source>Gas Used:</source>
         <translation>Gás usado:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1920"/>
+        <location filename="../qt-ui/models.cpp" line="1900"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1922"/>
+        <location filename="../qt-ui/models.cpp" line="1902"/>
         <source>Max. CNS:</source>
         <translation>CNS máximo:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1924"/>
+        <location filename="../qt-ui/models.cpp" line="1904"/>
         <source>Weights:</source>
         <translation>Lastro:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1929"/>
+        <location filename="../qt-ui/models.cpp" line="1909"/>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1936"/>
+        <location filename="../qt-ui/models.cpp" line="1916"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1938"/>
+        <location filename="../qt-ui/models.cpp" line="1918"/>
         <source>Buddy:</source>
         <translation>Companheiro:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1940"/>
+        <location filename="../qt-ui/models.cpp" line="1920"/>
         <source>Suit:</source>
         <translation>Roupa:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1942"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>Viz:</source>
         <translation>Visibilidade:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1944"/>
+        <location filename="../qt-ui/models.cpp" line="1924"/>
         <source>Rating:</source>
         <translation>Classificação:</translation>
     </message>
@@ -2319,75 +2500,90 @@ Por favor, remova-as primeiro.</translation>
 <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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/>
+        <source>Make first divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="906"/>
+        <source>Delete this divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="913"/>
         <source>Add Gas Change</source>
         <translation>Adicionar troca de gás</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>Adicionar favorito</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>Remover evento</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>Esconder eventos semelhantes</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>
+        <translation type="unfinished"/>
     </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>Mostrar todos os eventos</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>Ocultar eventos</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>Esconder todos os %1 eventos?</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>Remover o evento selecionado?</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>%1 @ %2:%3</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>AR</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>Remover este ponto</translation>
     </message>
@@ -2397,22 +2593,22 @@ Por favor, remova-as primeiro.</translation>
         <translation>Fechar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="34"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation>Média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="37"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation>Mínimo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="40"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation>Máximo</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>Mova o mapa e dê um duplo clique para definir a localização do ponto de mergulho.</translation>
     </message>
@@ -2426,9 +2622,23 @@ Por favor, remova-as primeiro.</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="128"/>
         <source>New starting number</source>
         <translation>Novo número inicial</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="126"/>
+        <source>New number</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchBar</name>
+    <message>
+        <location filename="../qt-ui/searchbar.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ShiftImageTimesDialog</name>
@@ -2440,47 +2650,52 @@ Por favor, remova-as primeiro.</translation>
     <message>
         <location filename="../qt-ui/shiftimagetimes.ui" line="34"/>
         <source>Shift times of image(s) by</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="102"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="95"/>
+        <source>h:mm</source>
+        <translation>h:mm</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="105"/>
         <source>earlier</source>
         <translation>mais cedo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="109"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="112"/>
         <source>later</source>
         <translation>mais tarde</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation>Arquivos de imagens (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
 </context>
 <context>
@@ -2498,18 +2713,18 @@ Por favor, remova-as primeiro.</translation>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="72"/>
         <source>Shifted time:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="79"/>
         <source>Current time:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="86"/>
         <location filename="../qt-ui/shifttimes.ui" line="93"/>
         <source>0:0</source>
-        <translation type="unfinished">0:0</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="126"/>
@@ -2552,48 +2767,48 @@ Por favor, remova-as primeiro.</translation>
     <message>
         <location filename="../qt-ui/about.cpp" line="13"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014&lt;/span&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>Serviço web</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/>
         <source>Connecting...</source>
         <translation>Conectando...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="421"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="419"/>
         <source>Download finished</source>
         <translation>Recebimento finalizado</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>Erro no recebimento: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/>
         <source>Connection Error: </source>
         <translation>Erro de conexão:</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>Identificador de usuário inválido!</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>Não é possível analisar a resposta!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/>
         <source>Download Success!</source>
         <translation>Operação de transferência bem sucedida!</translation>
     </message>
@@ -2609,17 +2824,17 @@ Por favor, remova-as primeiro.</translation>
 <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>Descrição</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2627,7 +2842,7 @@ Por favor, remova-as primeiro.</translation>
 <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>Informação</translation>
     </message>
@@ -2635,68 +2850,206 @@ Por favor, remova-as primeiro.</translation>
 <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="37"/>
-        <source>&lt;h3&gt;Subsurface was unable to check for updates.&lt;/h3&gt;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="36"/>
+        <source>Subsurface was unable to check for updates.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
-        <source>&lt;br/&gt;&lt;b&gt;The following error occurred:&lt;/b&gt;&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="41"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="43"/>
-        <source>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Please check your internet connection.&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>Manual do Usuário</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>Não foi possível encontrar o manual do Subsurface</translation>
     </message>
 </context>
 <context>
+    <name>UserSurvey</name>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="47"/>
+        <source>Subsurface User Survey</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="79"/>
+        <source>Recreational DIver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="92"/>
+        <source>Tech Diver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="105"/>
+        <source>Interested in dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="118"/>
+        <source>I am downloading dives from supported dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="131"/>
+        <source>I am importing dives from other software / sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="144"/>
+        <source>I am manually entering dives</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="190"/>
+        <source>Please type suggestions (in English) in the following box</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="27"/>
+        <source>
+Operating System: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="30"/>
+        <source>
+CPU Architecture: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="35"/>
+        <source>
+OS CPU Architecture %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="39"/>
+        <source>
+Language: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="73"/>
+        <source>Should we ask you later?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="74"/>
+        <source>Don&apos;t ask me again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="75"/>
+        <source>Ask Later</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="76"/>
+        <source>Ask again?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <source>Submit User Survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <source>Subsurface was unable to submit the user survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="101"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="102"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="111"/>
+        <source>Survey successfully submitted.</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </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>Descrição</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="723"/>
+        <location filename="../qt-ui/models.cpp" line="721"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2731,7 +3084,7 @@ Por favor, remova-as primeiro.</translation>
     <message>
         <location filename="../qt-ui/webservices.ui" line="85"/>
         <source>Save User ID locally?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="92"/>
@@ -2744,12 +3097,12 @@ Por favor, remova-as primeiro.</translation>
         <translation>Enviar</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>Tempo limite para operação estourou</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="279"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="277"/>
         <source>Transfering data...</source>
         <translation>Transferindo dados...</translation>
     </message>
@@ -2757,37 +3110,37 @@ Por favor, remova-as primeiro.</translation>
 <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>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="368"/>
+        <location filename="../qt-ui/models.cpp" line="373"/>
         <source>Weight</source>
         <translation>Peso</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>Ao clicar aqui irá remover este sistema de lastro.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="453"/>
+        <location filename="../qt-ui/models.cpp" line="458"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="454"/>
+        <location filename="../qt-ui/models.cpp" line="459"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="478"/>
+        <location filename="../qt-ui/models.cpp" line="483"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="484"/>
         <source>m</source>
         <translation>m</translation>
     </message>
@@ -2795,79 +3148,79 @@ Por favor, remova-as primeiro.</translation>
 <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>Ano
 &gt; Mês / Viagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>#</source>
         <translation>nº</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1643"/>
         <source>Duration 
  Total</source>
         <translation>Duração
 Total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>
 Average</source>
         <translation>
 Média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>
 Shortest</source>
         <translation>
 Mais curto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>
 Longest</source>
         <translation>
 Mais longo</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>Profundidade (%1)
 Média</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>
 Mínimo</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>
 Máximo</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>SAC (%1)
 Médio</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>Temp. (%1)
@@ -2877,99 +3230,92 @@ Médio</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="58"/>
+        <location filename="../dive.c" line="87"/>
         <source>pascal</source>
         <translation>pascal</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>bar</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>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="104"/>
-        <location filename="../qt-gui.cpp" line="292"/>
-        <source>l</source>
-        <translation>l</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>pés cúbicos</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>m</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>pé(s)</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>lbs</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>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1120"/>
+        <location filename="../dive.c" line="1237"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) ou (%s)</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>ar</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="170"/>
+        <location filename="../equipment.c" line="210"/>
         <source>integrated</source>
         <translation>integrado</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="171"/>
+        <location filename="../equipment.c" line="211"/>
         <source>belt</source>
         <translation>cinto</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="172"/>
+        <location filename="../equipment.c" line="212"/>
         <source>ankle</source>
         <translation>tornozelo</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="173"/>
+        <location filename="../equipment.c" line="213"/>
         <source>backplate weight</source>
         <translation>lastro no arnês</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="174"/>
+        <location filename="../equipment.c" line="214"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -2986,234 +3332,234 @@ Médio</translation>
         <translation>O número máximo de colunas suportadas ao importar arquivos CSV é %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>none</source>
         <translation>nenhum</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>deco stop</source>
         <translation>parada de deco</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ascent</source>
         <translation>subida</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ceiling</source>
         <translation>teto</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>workload</source>
         <translation>nível de esforço</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>transmitter</source>
         <translation>transmissor</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>violation</source>
         <translation>violação</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>bookmark</source>
         <translation>favorito</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>surface</source>
         <translation>superfície</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>safety stop</source>
         <translation>parada de segurança</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>troca de gás</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (voluntary)</source>
         <translation>parada de segurança (voluntária)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (mandatory)</source>
         <translation>parada de segurança (obrigatória)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>deepstop</source>
         <translation>parada profunda</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>ceiling (safety stop)</source>
         <translation>teto (parada de segurança)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>divetime</source>
         <translation>duração do mergulho</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>abaixo da zona de descompressão</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>maxdepth</source>
         <translation>prof máx</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>airtime</source>
         <translation>tempo de ar</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>heading</source>
         <translation>direção</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>tissue level warning</source>
         <translation>Alarme do nível nos tecidos</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>non stop time</source>
         <translation>tempo sem parada</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="163"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>invalid event number</source>
         <translation>número de evento inválido</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>Não é possivel criar o analisador para %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="411"/>
+        <location filename="../libdivecomputer.c" line="414"/>
         <source>Error registering the data</source>
         <translation>Erro no registo dos dados</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="419"/>
+        <location filename="../libdivecomputer.c" line="422"/>
         <source>Error parsing the datetime</source>
         <translation>Erro na análise da data/horário</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="438"/>
         <source>Dive %d: %s %d %04d</source>
         <translation>Mergulho nº %d: %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="440"/>
+        <location filename="../libdivecomputer.c" line="443"/>
         <source>Error parsing the divetime</source>
         <translation>Erro na análise da duração do mergulho</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="449"/>
+        <location filename="../libdivecomputer.c" line="452"/>
         <source>Error parsing the maxdepth</source>
         <translation>Erro na análise da profundidade máxima</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="458"/>
+        <location filename="../libdivecomputer.c" line="461"/>
         <source>Error parsing the gas mix count</source>
         <translation>Erro na análise da contagem de misturas de gases</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="470"/>
+        <location filename="../libdivecomputer.c" line="473"/>
         <source>Error obtaining water salinity</source>
         <translation>Erro na obtenção da salinidade da água</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error obtaining surface pressure</source>
         <translation>Erro na obtenção da pressão na superfície</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the gas mix</source>
         <translation>Erro na análise da mistura de gás</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="493"/>
+        <location filename="../libdivecomputer.c" line="496"/>
         <source>Error parsing the samples</source>
         <translation>Erro na análise das amostras</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="623"/>
+        <location filename="../libdivecomputer.c" line="626"/>
         <source>Event: waiting for user action</source>
         <translation>Evento: aguardando ação do usuário</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>modelo=%u (0x%08x), firmware=%u (0x%08x), Nº de série=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="691"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the event handler.</source>
         <translation>Erro no registo do rótulo do evento.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="696"/>
+        <location filename="../libdivecomputer.c" line="699"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Erro no registo do rótulo de cancelamento.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="717"/>
+        <location filename="../libdivecomputer.c" line="720"/>
         <source>Dive data import error</source>
         <translation>Erro ao importar os dados do mergulho</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="756"/>
+        <location filename="../libdivecomputer.c" line="759"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Não é possivel criar contexto da libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="763"/>
+        <location filename="../libdivecomputer.c" line="766"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Não se consegue abrir  %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="462"/>
+        <location filename="../parse-xml.c" line="466"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Percentagem estranha na leitura %s
@@ -3221,589 +3567,631 @@ Médio</translation>
 </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>Falha na análise de &apos;%s&apos;</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>A consulta &quot;get_events&quot; falhou.
 </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>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../file.c" line="166"/>
-        <source>Database connection failed &apos;%s&apos;.
+        <source>Database connection failed '%s'.
 </source>
         <translation>Conexão à base de dados falhou &apos;%s&apos;
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1887"/>
-        <location filename="../parse-xml.c" line="2034"/>
-        <source>Database query failed &apos;%s&apos;.
+        <location filename="../parse-xml.c" line="1945"/>
+        <location filename="../parse-xml.c" line="2092"/>
+        <source>Database query failed '%s'.
 </source>
         <translation>Consulta da base de dados falhou &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1998"/>
+        <location filename="../parse-xml.c" line="2056"/>
         <source>Database query get_cylinders failed.
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>Falha na abertura da folha de estilo %s</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>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="146"/>
-        <location filename="../planner.c" line="617"/>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation>Não é possível localizar o gás %d/%d</translation>
+        <location filename="../planner.c" line="159"/>
+        <location filename="../planner.c" line="752"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="308"/>
+        <location filename="../planner.c" line="345"/>
         <source>Too many gas mixes</source>
         <translation>Misturas de gás em excesso</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="489"/>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation>%s
-Plano de mergulho do Subsurface
-baseado em GFlow = %.0f e GFhigh = %.0f
-
-</translation>
+        <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"/>
     </message>
     <message>
-        <location filename="../planner.c" line="530"/>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Troca para %.*f %s em %d:%02d min - runtime %d:%02u em %s
-</translation>
+        <location filename="../planner.c" line="535"/>
+        <source>based on GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="539"/>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Permanecer a  %.*f %s durante %d:%02d min - runtime %d:%02u a %s
-</translation>
+        <location filename="../planner.c" line="538"/>
+        <source>Subsurface dive plan</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="550"/>
-        <source>Switch gas to %s
-</source>
-        <translation>Mudar para a mistura %s
-</translation>
+        <location filename="../planner.c" line="542"/>
+        <source>depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="558"/>
-        <source>Gas consumption:
-</source>
-        <translation>Consumo de gás:
-</translation>
+        <location filename="../planner.c" line="545"/>
+        <source>runtime</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="569"/>
-        <source>%.0f%s of %s
-</source>
-        <translation>%.0f%s de %s
-</translation>
+        <location filename="../planner.c" line="548"/>
+        <source>duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="551"/>
+        <source>gas</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="606"/>
+        <source>%3.0f%s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
+        <source>%3dmin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="629"/>
+        <source>Switch gas to %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="638"/>
+        <source>Gas consumption:</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="659"/>
+        <source>this is more gas than available in the specified cylinder!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="664"/>
+        <source>not enough reserve for gas sharing on ascent!</source>
+        <translation type="unfinished"/>
+    </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"/>
     </message>
     <message>
-        <location filename="../planner.c" line="810"/>
+        <location filename="../planner.c" line="668"/>
+        <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="980"/>
         <source>ean</source>
         <translation>ean</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1229"/>
+        <location filename="../profile.c" line="1253"/>
         <source>P: %d%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1233"/>
+        <location filename="../profile.c" line="1257"/>
         <source>T: %.1f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1263"/>
         <source>V: %.1f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1244"/>
+        <location filename="../profile.c" line="1268"/>
         <source>CNS: %u%%
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1246"/>
+        <location filename="../profile.c" line="1270"/>
         <source>pO%s: %.2fbar
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1272"/>
         <source>pN%s: %.2fbar
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="1274"/>
         <source>pHe: %.2fbar
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="1277"/>
         <source>MOD: %d%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1276"/>
+        <location filename="../profile.c" line="1300"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="1308"/>
         <source>Deco: %umin @ %.0f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1291"/>
+        <location filename="../profile.c" line="1315"/>
         <source>In deco
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1293"/>
+        <location filename="../profile.c" line="1317"/>
         <source>NDL: %umin
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1305"/>
+        <location filename="../profile.c" line="1329"/>
         <source>In deco (calc)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1307"/>
+        <location filename="../profile.c" line="1331"/>
         <source>NDL: %umin (calc)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1310"/>
+        <location filename="../profile.c" line="1334"/>
         <source>TTS: %umin (calc)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1313"/>
+        <location filename="../profile.c" line="1337"/>
         <source>Calculated ceiling %.0f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1319"/>
+        <location filename="../profile.c" line="1343"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1325"/>
+        <location filename="../profile.c" line="1349"/>
         <source>heartbeat: %d
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1327"/>
+        <location filename="../profile.c" line="1351"/>
         <source>bearing: %d
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1419"/>
+        <location filename="../profile.c" line="1443"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</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>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1435"/>
+        <location filename="../profile.c" line="1459"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1439"/>
+        <location filename="../profile.c" line="1463"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</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>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1454"/>
+        <location filename="../profile.c" line="1478"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="273"/>
+        <location filename="../qt-gui.cpp" line="281"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="276"/>
+        <location filename="../qt-gui.cpp" line="284"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="392"/>
-        <source>%1, %2 %3, %4 %5:%6</source>
-        <translation>%1, %2 %3, %4 %5:%6</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="405"/>
-        <source>%1 %2, %3
-%4:%5</source>
-        <translation>%1 %2, %3
-%4:%5</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="418"/>
+        <location filename="../qt-gui.cpp" line="417"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 mergulhos)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="423"/>
+        <location filename="../qt-gui.cpp" line="422"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 mergulho)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>boat</source>
         <translation>barco</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>shore</source>
         <translation>costa</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>drift</source>
         <translation>correnteza</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>deep</source>
         <translation>profundo</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>cavern</source>
         <translation>gruta (com luz natural)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>ice</source>
         <translation>gelo</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>wreck</source>
         <translation>naufrágio</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>cave</source>
         <translation>caverna</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>altitude</source>
         <translation>altitude</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>pool</source>
         <translation>piscina</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>lake</source>
         <translation>lago</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>river</source>
         <translation>rio</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>night</source>
         <translation>noturno</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>fresh</source>
         <translation>água doce</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>student</source>
         <translation>aluno</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>photo</source>
         <translation>foto</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>video</source>
         <translation>vídeo</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>instructor</source>
         <translation>instrutor</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="25"/>
         <source>deco</source>
         <translation>deco</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="216"/>
+        <location filename="../dive.c" line="133"/>
+        <source>ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="214"/>
         <source>more than %d days</source>
         <translation>mais que %d dias</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="220"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="224"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="235"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation>para mergulhos nº</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="242"/>
+        <location filename="../statistics.c" line="240"/>
         <source>for selected dives</source>
         <translation>para mergulhos selecionados</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="275"/>
         <source>for dive #%d</source>
         <translation>para mergulho nº %d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for selected dive</source>
         <translation>para mergulho selecionado</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for all dives</source>
         <translation>para todos os mergulhos</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="283"/>
+        <location filename="../statistics.c" line="281"/>
         <source>(no dives)</source>
         <translation>(nenhum mergulho)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Mon</source>
         <translation>Seg</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Tue</source>
         <translation>Ter</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Wed</source>
         <translation>Qua</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Thu</source>
         <translation>Qui</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Fri</source>
         <translation>Sex</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sat</source>
         <translation>Sáb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Feb</source>
         <translation>Fev</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Apr</source>
         <translation>Abr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Aug</source>
         <translation>Ago</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Sep</source>
         <translation>Set</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Oct</source>
         <translation>Out</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Dec</source>
         <translation>Dez</translation>
     </message>
@@ -3833,97 +4221,97 @@ Is the Uemis Zurich plugged in correctly?</source>
 O Uemis Zurich está conectado corretamente?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="107"/>
+        <location filename="../uemis-downloader.c" line="111"/>
         <source>unknown</source>
         <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="379"/>
+        <location filename="../uemis-downloader.c" line="383"/>
         <source>Reading %s %s</source>
         <translation>Lendo %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="399"/>
+        <location filename="../uemis-downloader.c" line="403"/>
         <source>data</source>
         <translation>dados</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="420"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>divelog entry id</source>
         <translation>identificador de registro no diário de mergulho</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="422"/>
+        <location filename="../uemis-downloader.c" line="426"/>
         <source>divespot data id</source>
         <translation>identificação dos dados do local de mergulho</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
+        <location filename="../uemis-downloader.c" line="428"/>
         <source>more data dive id</source>
         <translation>mais informações sobre identificador de mergulho</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>wetsuit</source>
         <translation>roupa úmida</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>semidry</source>
         <translation>semi-seca</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>drysuit</source>
         <translation>roupa seca</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>shorty</source>
         <translation>short</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>vest</source>
         <translation>casaco</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>long john</source>
         <translation>macacão</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>jacket</source>
         <translation>colete</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>full suit</source>
         <translation>roupa completa</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>2 pcs full suit</source>
         <translation>Roupa completa 2 peças</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="620"/>
+        <location filename="../uemis-downloader.c" line="624"/>
         <source>membrane</source>
         <translation>membrana</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="802"/>
+        <location filename="../uemis-downloader.c" line="823"/>
         <source>Init Communication</source>
         <translation>Iniciar Comunicação</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="804"/>
+        <location filename="../uemis-downloader.c" line="825"/>
         <source>Uemis init failed</source>
         <translation>Falha ao iniciar Uemis</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="815"/>
+        <location filename="../uemis-downloader.c" line="836"/>
         <source>Start download</source>
         <translation>Iniciar recebimento</translation>
     </message>
@@ -3944,18 +4332,18 @@ O Uemis Zurich está conectado corretamente?</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="203"/>
-        <source>PO2 Green Warning</source>
-        <translation>Alerta verde de PO2</translation>
+        <source>pO₂ Green Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
-        <source>PO2 Ascend Warning</source>
-        <translation>Alerta de subida de PO2</translation>
+        <source>pO₂ Ascend Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="208"/>
-        <source>PO2 Ascend Alarm</source>
-        <translation>Alarme de subida da PO2</translation>
+        <source>pO₂ Ascend Alarm</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
@@ -4017,5 +4405,214 @@ O Uemis Zurich está conectado corretamente?</translation>
         <source>Low Battery Alert</source>
         <translation>Alerta de nível de bateria baixo</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"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="36"/>
+        <source>Date:</source>
+        <translation>Data:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="38"/>
+        <source>Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="40"/>
+        <source>Duration:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="41"/>
+        <source>min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="43"/>
+        <source>Max Depth:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="46"/>
+        <source>Air Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="48"/>
+        <source>Water Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="50"/>
+        <source>Location:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="54"/>
+        <source>Notes:</source>
+        <translation>Notas:</translation>
+    </message>
+</context>
+<context>
+    <name>plannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="35"/>
+        <source>Rates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="56"/>
+        <source>Ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="77"/>
+        <source>below 75% avg. depth</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="94"/>
+        <source>75%-50% avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="111"/>
+        <source>50% avg. depth - 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="128"/>
+        <source>6m/20ft to surface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="148"/>
+        <source>Descent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="200"/>
+        <source>surface to the bottom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="226"/>
+        <source>Planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="247"/>
+        <source>GF low</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="264"/>
+        <source>GF high</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
+        <source>Drop to first depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
+        <source>Last Stop at 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>plan backgas breaks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="318"/>
+        <source>Gas Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <source>bottom SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="349"/>
+        <source>deco SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="359"/>
+        <source>bottom pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="389"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="382"/>
+        <source>deco pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="421"/>
+        <source>Dive Notes</source>
+        <translation>Notas do mergulho</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="445"/>
+        <source>display runtime</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="458"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="461"/>
+        <source>display segment duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="471"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="474"/>
+        <source>display transitions in deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="481"/>
+        <source>verbatim diveplan</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/subsurface_pt_PT.ts b/translations/subsurface_pt_PT.ts
index 18d34db69..455cc134a 100644
--- a/translations/subsurface_pt_PT.ts
+++ b/translations/subsurface_pt_PT.ts
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="pt_PT">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_PT" version="2.0">
+<defaultcodec>UTF-8</defaultcodec>
 <context>
     <name>CylindersModel</name>
     <message>
@@ -39,42 +38,42 @@
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="71"/>
+        <location filename="../qt-ui/models.cpp" line="70"/>
         <source>Switch at</source>
         <translation>Mudar a</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>Ao clicar aqui irá eliminar esta garrafa.</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>A garrafa não pode ser eliminada</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>A mistura está a ser usada. Apenas pode remover as garrafas não usadas durante o mergulho.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="507"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="508"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="527"/>
+        <location filename="../qt-ui/models.cpp" line="532"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="528"/>
+        <location filename="../qt-ui/models.cpp" line="533"/>
         <source>cuft</source>
         <translation>pés^3</translation>
     </message>
@@ -102,22 +101,22 @@ remover o computador de mergulho seleccionado?</translation>
 <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>Modelo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Device ID</source>
         <translation>ID do dispositivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Nickname</source>
         <translation>Alcunha</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>Ao clicar aqui irá remover este computador de mergulho.</translation>
     </message>
@@ -125,190 +124,326 @@ remover o computador de mergulho seleccionado?</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="90"/>
-        <source>air</source>
-        <translation>ar</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="92"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</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>Troca de emergência para circuito aberto</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>iniciar</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>fim</translation>
     </message>
 </context>
 <context>
-    <name>DiveGasPressureItem</name>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="475"/>
-        <source>air</source>
-        <translation>ar</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="476"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-</context>
-<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1258"/>
-        <source> l/min</source>
-        <translation>l/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
-        <source> cuft/min</source>
-        <translation>pés cúbicos/min</translation>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <source>/min</source>
+        <translation>/min</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>Mostrar caixa de busca</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="706"/>
         <source>expand all</source>
         <translation>expandir todos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="740"/>
+        <location filename="../qt-ui/divelistview.cpp" line="707"/>
         <source>collapse all</source>
         <translation>colapsar todos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="741"/>
+        <location filename="../qt-ui/divelistview.cpp" line="708"/>
         <source>collapse others</source>
         <translation>colapsar outros</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>remover mergulho(s) desta viagem</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>criar nova viagem acima</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>adicionar mergulho(s) à viagem imediatamente acima</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>adicionar mergulho(s) à viagem em baixo</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>juntar viagem com a viagem acima</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>juntar viagem com a viagem abaixo</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>eliminar mergulho(s)</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>marcar mergulho(s) como inválido(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
-        <source>save As</source>
-        <translation>gravar como</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="763"/>
-        <source>export As UDDF</source>
-        <translation>exportar como UDDF</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="764"/>
-        <source>export As CSV</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/divelistview.cpp" line="744"/>
+        <source>renumber dive(s)</source>
+        <translation>renumerar mergulho(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="765"/>
+        <location filename="../qt-ui/divelistview.cpp" line="745"/>
         <source>shift times</source>
         <translation>mudar os tempos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="766"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>load images</source>
         <translation>carregar imagens</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="769"/>
-        <source>upload dive(s) to divelogs.de</source>
-        <translation>exportar mergulho(s) para divelogs.de</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Open Image Files</source>
+        <translation>Abrir ficheiros de imagens</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation>Ficheiros de imagem (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <source>merge selected dives</source>
+        <translation>juntar os mergulhos seleccionados</translation>
+    </message>
+</context>
+<context>
+    <name>DiveLogExportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
+        <source>Export Dive Log Files</source>
+        <translation>Exportar ficheiros de dive log</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="24"/>
+        <source>General Export</source>
+        <translation>Exportar genérico</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="30"/>
+        <source>Export format</source>
+        <translation>Exportar formato</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="42"/>
+        <source>Subsurface XML</source>
+        <translation>Subsurface XML</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="61"/>
+        <source>UDDF</source>
+        <translation>UDDF</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="74"/>
+        <source>divelogs.de</source>
+        <translation>divelogs.de</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="84"/>
+        <source>CSV</source>
+        <translation>CSV</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="94"/>
+        <source>Worldmap</source>
+        <translation>Mapa mundo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="107"/>
+        <source>Selection</source>
+        <translation>Selacção</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="116"/>
+        <source>Selected dives</source>
+        <translation>Mergulhos seleccionados</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="126"/>
+        <source>All dives</source>
+        <translation>Todos os mergulhos</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="178"/>
+        <source>HTML</source>
+        <translation>HTML</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="184"/>
+        <source>General Settings</source>
+        <translation>Definições Gerais</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="190"/>
+        <source>Subsurface Numbers</source>
+        <translation>Números do Subsurface</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="203"/>
+        <source>Selected Dives</source>
+        <translation>Mergulhos seleccionados</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="216"/>
+        <source>Minimum Javascript</source>
+        <translation>Javascript mínimo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="229"/>
+        <source>All Dives</source>
+        <translation>Todos os mergulhos</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="239"/>
+        <source>Export List only</source>
+        <translation>Exportar apenas a lista</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="252"/>
+        <source>Style Options</source>
+        <translation>Opções de estilo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="264"/>
+        <source>Font</source>
+        <translation>Fonte</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="274"/>
+        <source>Font size</source>
+        <translation>Tamanho da fonte</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
+        <source>8</source>
+        <translation>8</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <source>10</source>
+        <translation>10</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <source>12</source>
+        <translation>12</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <source>14</source>
+        <translation>14</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <source>16</source>
+        <translation>16</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <source>18</source>
+        <translation>18</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="795"/>
-        <source>Save Dives As...</source>
-        <translation>Gravar mergulhos como...</translation>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <source>20</source>
+        <translation>20</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="814"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="323"/>
+        <source>Theme</source>
+        <translation>Tema</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
+        <source>Light</source>
+        <translation>Leve</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <source>Sand</source>
+        <translation>Areia</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="153"/>
         <source>Export UDDF File as</source>
-        <translation type="unfinished"></translation>
+        <translation>Exportar ficheiro UDDF como</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>Ficheiros UDDF  (*.uddf *.UDDF)</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>
+        <translation>Exportar ficheiros CSV como</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>
+        <translation>Ficheiros CSV (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Open Image Files</source>
-        <translation>Abrir ficheiros de imagens</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="162"/>
+        <source>Export World Map</source>
+        <translation>Exportar mapa mundo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
-        <translation>Ficheiros de imagem (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="163"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="177"/>
+        <source>HTML files (*.html)</source>
+        <translation>Ficheiros HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="760"/>
-        <source>merge selected dives</source>
-        <translation>juntar os mergulhos seleccionados</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="167"/>
+        <source>Export Subsurface XML</source>
+        <translation>Exportar XML do Subsurface</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="168"/>
+        <source>XML files (*.xml *.ssrf)</source>
+        <translation>Ficheiros XML (*.xml *.ssrf)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="176"/>
+        <source>Export HTML files as</source>
+        <translation>Exportar ficheiros HTML como</translation>
     </message>
 </context>
 <context>
@@ -319,138 +454,133 @@ remover o computador de mergulho seleccionado?</translation>
         <translation>Importar ficheiro de livro de registos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="36"/>
-        <source>Import CSV Dive Log Files</source>
-        <translation>Importar logbook em formato CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="50"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
         <source>CSV options</source>
         <translation>Opções CSV</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="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>Separador de campos</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>Importar pré-definições </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>Configuração de campos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="80"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="100"/>
         <source>Stopdepth</source>
         <translation>Profundidade da paragem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="107"/>
         <source>PO2</source>
         <translation>PO2</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>Tempo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="121"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="151"/>
         <source>Cns</source>
         <translation>CNS</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>Unidades</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>Métrico</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>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="248"/>
         <source>Manual dives</source>
         <translation>Mergulhos manuais</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="283"/>
         <source>Dive #</source>
         <translation>Mergulho #</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="317"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="385"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="470"/>
         <source>Tags</source>
         <translation>Etiquetas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
         <source>Location</source>
         <translation>Local</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="453"/>
         <source>Gps</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="300"/>
         <source>Max depth</source>
         <translation>Prof. Max.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="334"/>
         <source>Mean depth</source>
         <translation>Profundidade média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="368"/>
         <source>Buddy</source>
         <translation>Companheiros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="402"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="436"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
@@ -458,105 +588,70 @@ remover o computador de mergulho seleccionado?</translation>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="71"/>
-        <source>Bottom SAC</source>
-        <translation>Consumo no fundo</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="85"/>
-        <source>SAC on DECO Stop</source>
-        <translation>Consumo no patamar de descompressão</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="78"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="98"/>
-        <source>GFLow</source>
-        <translation>GFlow</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="125"/>
-        <source>Last Stop at 6m</source>
-        <translation>Última paragem aos 6 m</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="106"/>
+        <source>Planned Dive Time</source>
+        <translation>Tempo de mergulho planeado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="174"/>
-        <source>Start Time</source>
-        <translation>Hora de início</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="134"/>
+        <source>Altitude</source>
+        <translation>Altitude</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="181"/>
+        <location filename="../qt-ui/diveplanner.ui" line="141"/>
         <source>ATM Pressure</source>
         <translation>Pressão atmosférica</translation>
     </message>
-</context>
-<context>
-    <name>DivePlannerGraphics</name>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="114"/>
-        <source>10m</source>
-        <translation>10 m</translation>
-    </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="116"/>
-        <source>30ft</source>
-        <translation>30 pés</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="148"/>
+        <source>mbar</source>
+        <translation>mbar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="363"/>
-        <source>Handler Position Error</source>
-        <translation>Erro na posição</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>
-        <translation>Uma ou mais patamares serão eliminados com esta operação.
-Por favor, remova-os primeiro</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="158"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="445"/>
-        <source>AIR</source>
-        <translation>Ar</translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="137"/>
+        <source>unknown</source>
+        <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1148"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="586"/>
         <source>Final Depth</source>
         <translation>Profundidade final</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1150"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="588"/>
         <source>Run time</source>
         <translation>Tempo de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1152"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="590"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1154"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="592"/>
         <source>Used Gas</source>
         <translation>Gás usado</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>CC Set Point</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>Eliminar o plano?</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>Está prestes a eliminar o plano.</translation>
     </message>
@@ -564,17 +659,17 @@ Por favor, remova-os primeiro</translation>
 <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>Pontos do plano de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="256"/>
         <source>Available Gases</source>
         <translation>Gases disponíveis</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>adicionar ponto ao mergulho</translation>
     </message>
@@ -618,10 +713,25 @@ Por favor, remova-os primeiro</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
-        <source>Pressure  S</source>
+        <source>Pressure S</source>
         <translation>Pressão S</translation>
     </message>
     <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <source>pN₂</source>
+        <translation>pN₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>pHe</source>
+        <translation>pHe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Pressure I</source>
         <translation>Pressão I</translation>
@@ -636,86 +746,71 @@ Por favor, remova-os primeiro</translation>
         <source>SAC</source>
         <translation>Consumo</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
-        <source>PN2</source>
-        <translation>PN2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
-        <source>PHE</source>
-        <translation>PHE</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
-        <source>PO2</source>
-        <translation>PO2</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>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>date</source>
         <translation>data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>ft</source>
         <translation>pés</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1298"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>lbs</source>
         <translation>libras</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
+        <location filename="../qt-ui/models.cpp" line="1307"/>
         <source>suit</source>
         <translation>fato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1310"/>
         <source>cyl</source>
         <translation>garrafa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1344"/>
+        <location filename="../qt-ui/models.cpp" line="1325"/>
         <source>location</source>
         <translation>local</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1316"/>
         <source>SAC</source>
         <translation>Consumo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1338"/>
+        <location filename="../qt-ui/models.cpp" line="1319"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1341"/>
+        <location filename="../qt-ui/models.cpp" line="1322"/>
         <source>maxCNS</source>
         <translation>CNS máx</translation>
     </message>
@@ -723,115 +818,115 @@ Por favor, remova-os primeiro</translation>
 <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>Resposta inválida do servidor</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>Esperada a tag XML &apos;DiveDateReader&apos;. Em vez disso recebemos &apos;%1</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>A tag XML esperada &apos;DiveDates&apos; não foi encontrada</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>Resposta XML mal formada. Linha %1: %2</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>não foram seleccionados nenhuns mergulhos</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>erro ao criar um ficheiro zip para upload&gt; %s</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>não foi possível criar o ficheiro temporário: %1</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>erro interno: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="181"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="179"/>
         <source>internal error</source>
         <translation>erro interno</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>Concluído</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>A carregar a lista dos mergulhos...</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>A descarregar a lista dos mergulhos...</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>A descarregar %1 mergulhos</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>Descarga terminada - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
         <source>Corrupted download</source>
         <translation>Descarga corrompida</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>Não foi possível abrir o ficheiro:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Upload failed</source>
         <translation>Exportação falhou</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="849"/>
         <source>Upload successful</source>
         <translation>Exportação bem sucedida</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="854"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="852"/>
         <source>Login failed</source>
         <translation>O login falhou</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>Não foi possível analisar a resposta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="868"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Error: %1</source>
         <translation>Erro: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="835"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/>
         <source>Upload finished</source>
         <translation>Carregamento terminado</translation>
     </message>
@@ -839,54 +934,54 @@ Por favor, remova-os primeiro</translation>
 <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>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="165"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/>
         <source>Error</source>
         <translation>Erro</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>Repetir</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>Procurar computador de mergulho Uemis</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>Seleccione o ficheiro para descarregar os mergulhos do computador de mergulho</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>Ficheiros log (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="339"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
         <source>Warning</source>
         <translation>Aviso</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>Gravar a descarga do libdivecomputer não irá descarregar os mergulhos para a lista</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>Seleccione o ficheiro para gravar a descarga binária do libdivecomputer</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>Ficheiros dump (*.bin)</translation>
     </message>
@@ -954,7 +1049,7 @@ Por favor, remova-os primeiro</translation>
 <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>Editar locais seleccionados</translation>
     </message>
@@ -963,848 +1058,858 @@ Por favor, remova-os primeiro</translation>
     <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>Notas</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>Local</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="148"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Coordinates</source>
         <translation>Coordenadas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="169"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
         <source>Divemaster</source>
         <translation>Guia de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="155"/>
+        <location filename="../qt-ui/maintab.ui" line="148"/>
         <source>Buddy</source>
         <translation>Companheiros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="63"/>
-        <source>Start time</source>
-        <translation>Hora de início</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>Temperatura do ar</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>Temperatura da água</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="127"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Tags</source>
         <translation>Etiquetas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="223"/>
         <source>Rating</source>
         <translation>Classificação</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="236"/>
         <source>Visibility</source>
         <translation>Visibilidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="215"/>
+        <location filename="../qt-ui/maintab.ui" line="127"/>
         <source>Suit</source>
         <translation>Fato</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>Notas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="270"/>
+        <location filename="../qt-ui/maintab.ui" line="311"/>
         <source>Equipment</source>
         <translation>Equipamento</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="350"/>
+        <location filename="../qt-ui/maintab.ui" line="391"/>
         <source>Dive Info</source>
         <translation>Informações do mergulho</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>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="414"/>
+        <location filename="../qt-ui/maintab.ui" line="275"/>
+        <source>Time</source>
+        <translation>Tempo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="455"/>
         <source>Interval</source>
         <translation>Intervalo de superfície</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="433"/>
+        <location filename="../qt-ui/maintab.ui" line="474"/>
         <source>Gases Used</source>
         <translation>Gases usados</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="452"/>
+        <location filename="../qt-ui/maintab.ui" line="493"/>
         <source>Gas Consumed</source>
         <translation>Gás consumido</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>Consumo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="531"/>
         <source>Max. Depth</source>
         <translation>Prof. Máxima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="509"/>
+        <location filename="../qt-ui/maintab.ui" line="550"/>
         <source>Ave. Depth</source>
         <translation>Prof. Média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="528"/>
+        <location filename="../qt-ui/maintab.ui" line="569"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="547"/>
+        <location filename="../qt-ui/maintab.ui" line="588"/>
         <source>Air Pressure</source>
         <translation>Pressão </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="566"/>
+        <location filename="../qt-ui/maintab.ui" line="607"/>
         <source>Air Temperature</source>
         <translation>Temperatura do ar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="585"/>
+        <location filename="../qt-ui/maintab.ui" line="626"/>
         <source>Water Temperature</source>
         <translation>Temperatura da água</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="604"/>
+        <location filename="../qt-ui/maintab.ui" line="645"/>
         <source>Dive Time</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="623"/>
+        <location filename="../qt-ui/maintab.ui" line="664"/>
         <source>Salinity</source>
         <translation>Salinidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="660"/>
+        <location filename="../qt-ui/maintab.ui" line="701"/>
         <source>Stats</source>
         <translation>Estatísticas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="746"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Temperature</source>
         <translation>Temperatura da água</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="784"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Total Time</source>
         <translation>Tempo total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="835"/>
         <source>Dives</source>
         <translation>Mergulhos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
+        <source>Gas Consumption</source>
+        <translation>Consumo de gás</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="919"/>
+        <source>Photos</source>
+        <translation>Fotos</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="89"/>
         <source>Cylinders</source>
         <translation>Garrafas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="90"/>
         <source>Add Cylinder</source>
         <translation>Adicionar garrafa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="93"/>
         <source>Weights</source>
         <translation>Lastro</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>Adicionar sistema de lastro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="438"/>
+        <location filename="../qt-ui/maintab.cpp" line="409"/>
         <source>Trip Location</source>
         <translation>Local da viagem</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>Notas sobre a viagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="42"/>
+        <location filename="../qt-ui/maintab.cpp" line="48"/>
         <source>Save</source>
         <translation>Gravar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="46"/>
+        <location filename="../qt-ui/maintab.cpp" line="52"/>
         <source>Cancel</source>
         <translation>Cancelar</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>Temperatura do ar [%1]</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>Temperatura da água [%1]</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>Esta viagem está a ser editada.</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>Estão a ser editados vários mergulhos.</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>Este mergulho está a ser editado.</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>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="494"/>
+        <location filename="../qt-ui/maintab.cpp" line="464"/>
         <source>unknown</source>
         <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>N</source>
-        <translation>N</translation>
+        <location filename="../qt-ui/maintab.cpp" line="501"/>
+        <source>Deepest Dive</source>
+        <translation>Mergulho mais fundo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>S</source>
-        <translation>S</translation>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <source>Shallowest Dive</source>
+        <translation>Mergulho mais baixo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>E</source>
-        <translation>E</translation>
+        <location filename="../qt-ui/maintab.cpp" line="794"/>
+        <source>Discard the Changes?</source>
+        <translation>Eliminar as alterações?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>W</source>
-        <translation>O</translation>
+        <location filename="../qt-ui/maintab.cpp" line="795"/>
+        <source>You are about to discard your changes.</source>
+        <translation>Está prestes a eliminar as alterações.</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>Filtros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="571"/>
+        <location filename="../qt-ui/mainwindow.ui" line="646"/>
         <source>&amp;File</source>
         <translation>&amp;Ficheiro</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>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Detalhes do plano de mergulho&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="583"/>
+        <source>Print</source>
+        <translation>Imprimir</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:'Courier'; 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>&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;</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="606"/>
+        <location filename="../qt-ui/mainwindow.ui" line="679"/>
         <source>&amp;View</source>
         <translation>&amp;Ver</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="628"/>
+        <location filename="../qt-ui/mainwindow.ui" line="701"/>
         <source>&amp;Help</source>
         <translation>&amp;Ajuda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="636"/>
+        <location filename="../qt-ui/mainwindow.ui" line="709"/>
         <source>&amp;Import</source>
         <translation>&amp;Importar</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>&amp;Novo logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="655"/>
+        <location filename="../qt-ui/mainwindow.ui" line="728"/>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="658"/>
+        <location filename="../qt-ui/mainwindow.ui" line="731"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</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>&amp;Abrir logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="666"/>
+        <location filename="../qt-ui/mainwindow.ui" line="739"/>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <location filename="../qt-ui/mainwindow.ui" line="742"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="674"/>
+        <location filename="../qt-ui/mainwindow.ui" line="747"/>
         <source>&amp;Save</source>
         <translation>&amp;Gravar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="677"/>
+        <location filename="../qt-ui/mainwindow.ui" line="750"/>
         <source>Save</source>
         <translation>Gravar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="680"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</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>G&amp;ravar como</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>Save as</source>
         <translation>Guardar como...</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>Ctrl+Shift+S</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>&amp;Fechar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Close</source>
         <translation>Encerrar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="702"/>
+        <location filename="../qt-ui/mainwindow.ui" line="775"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="902"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <source>P&amp;references</source>
+        <translation>P&amp;referências</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="831"/>
+        <source>&amp;Add Dive</source>
+        <translation>&amp;Adicionar Mergulho</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <source>Auto &amp;Group</source>
+        <translation>Agrupar &amp;automaticamente</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="863"/>
+        <source>&amp;Dive List</source>
+        <translation>&amp;Lista de mergulhos</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="871"/>
+        <source>&amp;Profile</source>
+        <translation>&amp;Perfil</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="879"/>
+        <source>&amp;Info</source>
+        <translation>&amp;Informações</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="887"/>
+        <source>&amp;All</source>
+        <translation>&amp;Todas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="895"/>
+        <source>P&amp;rev DC</source>
+        <translation>Computador de mergulho anterior</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="903"/>
+        <source>&amp;Next DC</source>
+        <translation>&amp;Próximo computador de mergulho</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="911"/>
+        <source>&amp;Select Events</source>
+        <translation>&amp;Seleccionar eventos</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <source>&amp;About Subsurface</source>
+        <translation>&amp;Acerca do Subsurface</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="937"/>
+        <source>&amp;Globe</source>
+        <translation>&amp;Globo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="953"/>
+        <source>&amp;Import Log Files</source>
+        <translation>&amp;Importar ficheiros de logbook</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="959"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="707"/>
-        <source>Export &amp;UDDF</source>
-        <translation>Exportar &amp;UDDF</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="1008"/>
+        <source>&amp;Export</source>
+        <translation>&amp;Exportar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1011"/>
+        <source>Export Dive Logs</source>
+        <translation>Exportar registos de mergulho</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1014"/>
+        <source>Ctrl+E</source>
+        <translation>Ctrl+E</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Enable the pN2 Graph</source>
         <translation>Mostrar o gráfico da pN2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <location filename="../qt-ui/mainwindow.ui" line="128"/>
         <source>Enable the pHe graph</source>
         <translation>Mostrar o gráfico da pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <location filename="../qt-ui/mainwindow.ui" line="290"/>
         <source>Show/hide heart rate</source>
         <translation>Mostrar/ocultar ritmo cardíaco</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <location filename="../qt-ui/mainwindow.ui" line="342"/>
         <source>Enable EAD, END, and EADD</source>
         <translation>Mostrar EAD, END e EADD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="238"/>
         <source>Show NDL / TTS</source>
         <translation>Mostrar NDL / TTS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="456"/>
+        <location filename="../qt-ui/mainwindow.ui" line="394"/>
         <source>Rescale depth axis</source>
         <translation>Alterar a escala do eixo da profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="710"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="715"/>
-        <source>Export HTML World Map</source>
-        <translation>Exportar mapa mundo em HTML</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="718"/>
-        <source>Ctrl+H</source>
-        <translation>Ctrl+H</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="723"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>&amp;Print</source>
         <translation>&amp;Imprimir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="734"/>
+        <location filename="../qt-ui/mainwindow.ui" line="791"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="742"/>
+        <location filename="../qt-ui/mainwindow.ui" line="799"/>
         <source>&amp;Quit</source>
         <translation>&amp;Fechar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="753"/>
+        <location filename="../qt-ui/mainwindow.ui" line="810"/>
         <source>Import from &amp;dive computer</source>
         <translation>Importar do &amp;computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="818"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation>Importar &amp;GPS do serviço Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="764"/>
+        <location filename="../qt-ui/mainwindow.ui" line="821"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="826"/>
         <source>&amp;Edit Device Names</source>
         <translation>&amp;Editar nomes dos computadores</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="834"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="782"/>
+        <location filename="../qt-ui/mainwindow.ui" line="839"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Renumerar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="785"/>
+        <location filename="../qt-ui/mainwindow.ui" line="842"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="798"/>
+        <location filename="../qt-ui/mainwindow.ui" line="855"/>
         <source>&amp;Yearly Statistics</source>
         <translation>&amp;Estatísticas anuais</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="801"/>
+        <location filename="../qt-ui/mainwindow.ui" line="858"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="806"/>
-        <source>Dive List</source>
-        <translation>Lista de mergulhos</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="814"/>
-        <source>Profile</source>
-        <translation>Perfil</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="822"/>
-        <source>Info</source>
-        <translation>Info</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="830"/>
-        <source>All</source>
-        <translation>Todos</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="872"/>
+        <location filename="../qt-ui/mainwindow.ui" line="929"/>
         <source>User &amp;Manual</source>
         <translation>&amp;Manual do utilizador</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="880"/>
-        <source>Globe</source>
-        <translation>Globo</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="888"/>
+        <location filename="../qt-ui/mainwindow.ui" line="945"/>
         <source>P&amp;lan Dive</source>
         <translation>P&amp;lanear mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="891"/>
+        <location filename="../qt-ui/mainwindow.ui" line="948"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="907"/>
-        <source>Import from Divelogs.de</source>
-        <translation>Importar a partir de Divelogs.de</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1003"/>
         <source>&amp;Check for Updates</source>
         <translation>&amp;Procurar updates</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="951"/>
-        <source>Export CSV</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="726"/>
+        <location filename="../qt-ui/mainwindow.ui" line="783"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</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>Mostrar gráfico da pO2</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>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="316"/>
         <source>Enable MOD</source>
         <translation>Mostrar MOD</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>Mostrar o tecto registado pelo computador de mergulho</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>Mostrar tecto calculado</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>Mostrar tecto calculado com intervalos de 3 m</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>Calcular para todos os tecidos</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>Mostrar taxa de consumo</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>Mostrar / Esconder régua</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="731"/>
-        <source>Preferences</source>
-        <translation>Preferências</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="745"/>
+        <location filename="../qt-ui/mainwindow.ui" line="802"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="756"/>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="774"/>
-        <source>Add Dive</source>
-        <translation>Adicionar mergulho</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="793"/>
-        <source>Auto Group</source>
-        <translation>Agrupar automaticamente</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="809"/>
+        <location filename="../qt-ui/mainwindow.ui" line="866"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="817"/>
+        <location filename="../qt-ui/mainwindow.ui" line="874"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <location filename="../qt-ui/mainwindow.ui" line="882"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="833"/>
+        <location filename="../qt-ui/mainwindow.ui" line="890"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="838"/>
-        <source>Prev DC</source>
-        <translation>Computador de mergulho anterior</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="841"/>
+        <location filename="../qt-ui/mainwindow.ui" line="898"/>
         <source>Left</source>
         <translation>Esquerda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="846"/>
-        <source>Next DC</source>
-        <translation>Computador de mergulho seguinte</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="849"/>
+        <location filename="../qt-ui/mainwindow.ui" line="906"/>
         <source>Right</source>
         <translation>Direita</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="854"/>
-        <source>Select Events</source>
-        <translation>Seleccionar Eventos</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <location filename="../qt-ui/mainwindow.ui" line="916"/>
         <source>Input Plan</source>
         <translation>Introduzir Plano</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="864"/>
-        <source>About Subsurface</source>
-        <translation>Sobre o Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="875"/>
+        <location filename="../qt-ui/mainwindow.ui" line="932"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="883"/>
+        <location filename="../qt-ui/mainwindow.ui" line="940"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="896"/>
-        <source>Import Log Files</source>
-        <translation>Importar logbooks</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="899"/>
+        <location filename="../qt-ui/mainwindow.ui" line="956"/>
         <source>Import divelog files from other applications</source>
         <translation>Importar logbooks de outros programas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="915"/>
+        <location filename="../qt-ui/mainwindow.ui" line="964"/>
+        <source>Import &amp;from Divelogs.de</source>
+        <translation>Importar &amp;de Divelogs.de</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="972"/>
         <source>&amp;Full Screen</source>
         <translation>&amp;Ecrã completo</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>Ligar ecrã completo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <location filename="../qt-ui/mainwindow.ui" line="978"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="174"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
         <source>Open File</source>
         <translation>Abrir Ficheiro</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>Por favor grave ou cancele as edições feitas a este mergulho antes de fechar o ficheiro.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="330"/>
-        <source>Please save or cancel the current dive edit before trying to plan a dive.</source>
-        <translation>Por favor grave ou cancele as edições a este mergulho antes de tentar planear outro.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="396"/>
+        <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>Por favor grave ou cancele as edições feitas a este mergulho antes de adicionar outro mergulho.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="645"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="419"/>
+        <source>Print runtime table</source>
+        <translation>Imprimir tabela de runtime</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="710"/>
         <source>Do you want to save the changes you made in the file %1?</source>
         <translation>Deseja gravar as alterações feitas ao ficheiro %1?</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>Deseja gravar as alterações feitas ao ficheiro de dados?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="652"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="717"/>
         <source>Save Changes?</source>
         <translation>Guardar alterações?</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>As alterações serão perdidas se não forem gravadas.</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>Gravar ficheiro como</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>Aviso</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>Por favor grave ou cancele as edições feitas a este mergulho antes de abrir um novo ficheiro.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="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>Ficheiros UDDF  (*.uddf *.UDDF)</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>
-        <translation>Exportar mapa mundo</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="300"/>
-        <source>HTML files (*.html)</source>
-        <translation>Ficheiros HTML (*.html)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="449"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="514"/>
         <source>Yearly Statistics</source>
         <translation>Estatísticas anuais</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="961"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1076"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Ficheiro XML do Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1199"/>
         <source>Open Dive Log File</source>
         <translation>Abrir logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <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>Ficheiros de logbooks (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;Ficheiros XML (*.xml);;Ficheiros UDDF/UDCF(*.uddf *.udcf);;Ficheiros JDiveLog(*.jlb);;Ficheiros Suunto(*.sde *.db);;Ficheiros CSV(*.csv);;Todos os ficheiros(*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1225"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Por favor, termine a edição em curso antes de iniciar outra.</translation>
     </message>
 </context>
 <context>
+    <name>PlannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Last stop at 20ft</source>
+        <translation>Última paragem aos 20 ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="416"/>
+        <source>Last stop at 6m</source>
+        <translation>Última paragem aos 6 m</translation>
+    </message>
+</context>
+<context>
     <name>PreferencesDialog</name>
     <message>
         <location filename="../qt-ui/preferences.ui" line="85"/>
@@ -1827,247 +1932,297 @@ Por favor, remova-os primeiro</translation>
         <translation>Língua</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="141"/>
+        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <source>Network</source>
+        <translation>Rede</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="151"/>
         <source>Lists and Tables</source>
         <translation>Listas e tabelas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font</source>
         <translation>Fonte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="167"/>
         <source>Font size</source>
         <translation>Tamanho da fonte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="170"/>
+        <location filename="../qt-ui/preferences.ui" line="180"/>
         <source>Dives</source>
         <translation>Mergulhos</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>Logbook preferido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="188"/>
+        <location filename="../qt-ui/preferences.ui" line="198"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="197"/>
+        <location filename="../qt-ui/preferences.ui" line="207"/>
         <source>Display Invalid</source>
         <translation>Mostrar inválidos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="214"/>
+        <location filename="../qt-ui/preferences.ui" line="224"/>
         <source>Default Cylinder</source>
         <translation>Garrafa preferida</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>Usar como garrafa preferida</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <location filename="../qt-ui/preferences.ui" line="247"/>
         <source>Animations</source>
         <translation>Animações</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <location filename="../qt-ui/preferences.ui" line="253"/>
         <source>Speed</source>
         <translation>Velocidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="270"/>
+        <location filename="../qt-ui/preferences.ui" line="280"/>
         <source>Subsurface Webservice</source>
         <translation>Serviço Web do Subsurfce</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>ID do utilizador preferido</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>Gravar a ID do utilizador localmente?</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>Limpar todas as definições</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="312"/>
+        <source>Reset all settings to their default value</source>
+        <translation>Restaurar todas as definições para o seu valor padrão</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
         <source>System</source>
         <translation>Sistema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="348"/>
         <source>Metric</source>
         <translation>Métrico</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="333"/>
+        <location filename="../qt-ui/preferences.ui" line="358"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="343"/>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
         <source>Personalize</source>
         <translation>Personalizar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="392"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="374"/>
+        <location filename="../qt-ui/preferences.ui" line="399"/>
         <source>meter</source>
         <translation>metro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="409"/>
         <source>feet</source>
         <translation>pés</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="401"/>
+        <location filename="../qt-ui/preferences.ui" line="426"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="411"/>
+        <location filename="../qt-ui/preferences.ui" line="436"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="428"/>
+        <location filename="../qt-ui/preferences.ui" line="453"/>
         <source>liter</source>
         <translation>litro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="438"/>
+        <location filename="../qt-ui/preferences.ui" line="463"/>
         <source>cu ft</source>
         <translation>pés cúbicos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="455"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="465"/>
+        <location filename="../qt-ui/preferences.ui" line="490"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="482"/>
+        <location filename="../qt-ui/preferences.ui" line="507"/>
         <source>kg</source>
         <translation>kg</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>Limite para mostrar pO2</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>Limite para mostrar pN2</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>Limite para mostrar pHe</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="636"/>
-        <source>max ppO₂ when showing MOD</source>
-        <translation>ppO2 máxima quando mostrar MOD</translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="811"/>
+        <source>Proxy</source>
+        <translation>Proxy</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="817"/>
+        <source>Proxy type</source>
+        <translation>Tipo de proxy</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="830"/>
+        <source>Host</source>
+        <translation>Host</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="856"/>
+        <source>Port</source>
+        <translation>Porta</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="882"/>
+        <source>Requires authentication</source>
+        <translation>Requer autenticação</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
+        <source>Username</source>
+        <translation>Nome de utilizador</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="657"/>
+        <location filename="../qt-ui/preferences.ui" line="925"/>
+        <source>Password</source>
+        <translation>Palavra-passe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="682"/>
         <source>draw dive computer reported ceiling red</source>
         <translation>desenhar o tecto indicado pelo computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="747"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>System Default</source>
         <translation>Linguagem do sistema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="767"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>Filter</source>
         <translation>Filtros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="419"/>
         <source>Pressure</source>
         <translation>Pressão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="421"/>
+        <location filename="../qt-ui/preferences.ui" line="446"/>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="448"/>
+        <location filename="../qt-ui/preferences.ui" line="473"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="475"/>
+        <location filename="../qt-ui/preferences.ui" line="500"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="517"/>
         <source>lbs</source>
         <translation>libra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="507"/>
+        <location filename="../qt-ui/preferences.ui" line="532"/>
         <source>Time units</source>
         <translation>Unidades de tempo</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>Denominador da velocidade de subida/descida</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="520"/>
+        <location filename="../qt-ui/preferences.ui" line="545"/>
         <source>Minutes</source>
         <translation>Minutos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="530"/>
+        <location filename="../qt-ui/preferences.ui" line="555"/>
         <source>Seconds</source>
         <translation>Segundos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="562"/>
+        <location filename="../qt-ui/preferences.ui" line="587"/>
         <source>Show</source>
         <translation>Mostrar</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>pO₂ máxima quando a mostrar MOD</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="693"/>
         <source>Show non-used cylinders in Equipment Tab</source>
         <translation>Mostrar garrafas não utilizadas na janela do equipamento</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>mostrar profundidade média</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>GFlow à profundidade máxima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="691"/>
+        <location filename="../qt-ui/preferences.ui" line="716"/>
         <source>Misc</source>
         <translation>Diversos</translation>
     </message>
@@ -2077,35 +2232,66 @@ Por favor, remova-os primeiro</translation>
         <translation>Preferências</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="697"/>
+        <location filename="../qt-ui/preferences.ui" line="722"/>
         <source>GFLow</source>
         <translation>GFlow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="739"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="23"/>
+        <source>No proxy</source>
+        <translation>Sem proxy</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="24"/>
+        <source>System proxy</source>
+        <translation>Proxy do sistema</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="25"/>
+        <source>HTTP proxy</source>
+        <translation>Proxy HTTP</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="26"/>
+        <source>SOCKS proxy</source>
+        <translation>Proxy SOCKS</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="245"/>
         <source>Restart required</source>
         <translation>É necessário reiniciar a aplicação</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>Para alterar a linguagem é necessário reiniciar o Subsurface.</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>Abrir o logbook preferido</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>Ficheiro XML do Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="394"/>
+        <source>Warning</source>
+        <translation>Aviso</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>Se clicar em OK, todos os valores do Subsurface serão reinicializados para os seus valores predefinidos.
+Isto terá um efeito imediato.</translation>
+    </message>
 </context>
 <context>
     <name>PrintDialog</name>
@@ -2246,72 +2432,72 @@ Por favor, remova-os primeiro</translation>
 <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>desconhecido</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>Mergulho #%1 - %2</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>Prof. Máxima: %1 %2</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>Duração: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1918"/>
+        <location filename="../qt-ui/models.cpp" line="1898"/>
         <source>Gas Used:</source>
         <translation>Gás usado:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1920"/>
+        <location filename="../qt-ui/models.cpp" line="1900"/>
         <source>SAC:</source>
         <translation>Consumo:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1922"/>
+        <location filename="../qt-ui/models.cpp" line="1902"/>
         <source>Max. CNS:</source>
         <translation>CNS máximo:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1924"/>
+        <location filename="../qt-ui/models.cpp" line="1904"/>
         <source>Weights:</source>
         <translation>Lastro:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1929"/>
+        <location filename="../qt-ui/models.cpp" line="1909"/>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1936"/>
+        <location filename="../qt-ui/models.cpp" line="1916"/>
         <source>Divemaster:</source>
         <translation>Guia:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1938"/>
+        <location filename="../qt-ui/models.cpp" line="1918"/>
         <source>Buddy:</source>
         <translation>Companheiros:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1940"/>
+        <location filename="../qt-ui/models.cpp" line="1920"/>
         <source>Suit:</source>
         <translation>Fato:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1942"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>Viz:</source>
         <translation>Visibilidade:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1944"/>
+        <location filename="../qt-ui/models.cpp" line="1924"/>
         <source>Rating:</source>
         <translation>Classificação:</translation>
     </message>
@@ -2319,62 +2505,77 @@ Por favor, remova-os primeiro</translation>
 <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>(#%1 of %2)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/>
+        <source>Make first divecomputer</source>
+        <translation>Criar primeiro computador de mergulho</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="906"/>
+        <source>Delete this divecomputer</source>
+        <translation>Eliminar este computador de mergulho</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="913"/>
         <source>Add Gas Change</source>
         <translation>Adicionar troca de gás</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>Adicionar marcador</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>Remover evento</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>Esconder eventos semelhantes</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>Editar nome</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>Mostrar todos os eventos</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>Ocultar eventos</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>Ocultar todos os %1 eventos?</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>Remover o evento seleccionado?</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>%1 @ %2:%3</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>Editar nome da marcação</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>Nome personalizado:</translation>
     </message>
@@ -2382,12 +2583,12 @@ Por favor, remova-os primeiro</translation>
 <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>Ar</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>Remover este ponto</translation>
     </message>
@@ -2397,22 +2598,22 @@ Por favor, remova-os primeiro</translation>
         <translation>Encerrar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="34"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation>Média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="37"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation>Mínima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="40"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation>Máxima</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>Mova o mapa e dê um duplo clique para definir o local de mergulho</translation>
     </message>
@@ -2426,9 +2627,23 @@ Por favor, remova-os primeiro</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="128"/>
         <source>New starting number</source>
         <translation>Novo número inicial</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="126"/>
+        <source>New number</source>
+        <translation>Novo número</translation>
+    </message>
+</context>
+<context>
+    <name>SearchBar</name>
+    <message>
+        <location filename="../qt-ui/searchbar.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulário</translation>
+    </message>
 </context>
 <context>
     <name>ShiftImageTimesDialog</name>
@@ -2443,42 +2658,47 @@ Por favor, remova-os primeiro</translation>
         <translation>Alterar horas da(s) imagem(ns) em</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="102"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="95"/>
+        <source>h:mm</source>
+        <translation>h:mm</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="105"/>
         <source>earlier</source>
         <translation>mais cedo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="109"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="112"/>
         <source>later</source>
         <translation>mais tarde</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>Para calcular a diferença entre os relógios do seu computador de mergulho e a sua câmara, use a câmara para tirar uma fotografia do seu computador de mergulho onde se veja a hora actual. Descarregue a imagem para o seu PC e prima este botão.</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>Determinar a diferença de tempo da câmara</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>Seleccionar imagem do computador de mergulho em que se vejam as horas</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>Que data e hora estão representados na imagem?</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>Abrir imagem</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>Ficheiros de imagem (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2558,42 +2778,42 @@ Por favor, remova-os primeiro</translation>
 <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>Serviço web</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/>
         <source>Connecting...</source>
         <translation>Ligar ...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="421"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="419"/>
         <source>Download finished</source>
         <translation>Descarga terminada</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>Erro na descarga: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/>
         <source>Connection Error: </source>
         <translation>Erro de ligação:</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>Identificação de utilizador inválida !</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>Não é possível analisar a resposta !</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/>
         <source>Download Success!</source>
         <translation>Operação de transferência bem sucedida!</translation>
     </message>
@@ -2609,17 +2829,17 @@ Por favor, remova-os primeiro</translation>
 <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>Descrição</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2627,7 +2847,7 @@ Por favor, remova-os primeiro</translation>
 <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>Informação</translation>
     </message>
@@ -2635,42 +2855,42 @@ Por favor, remova-os primeiro</translation>
 <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>Procurar actualizações</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="37"/>
-        <source>&lt;h3&gt;Subsurface was unable to check for updates.&lt;/h3&gt;</source>
-        <translation>&lt;h3&gt;Não foi possível encontrar actualizações para o Subsurface.&lt;/h3&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="36"/>
+        <source>Subsurface was unable to check for updates.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
-        <source>&lt;br/&gt;&lt;b&gt;The following error occurred:&lt;/b&gt;&lt;br/&gt;</source>
-        <translation>&lt;br/&gt;&lt;b&gt;Ocorreu o seguinte erro:&lt;/b&gt;&lt;br/&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="41"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="43"/>
-        <source>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Please check your internet connection.&lt;/b&gt;</source>
-        <translation>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Por favor, verifique a sua ligação à internet.&lt;/b&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
     </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>Está a usar a versão mais recente do Subsurface</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>Está disponível uma nova versão do Subsurface.&lt;br/&gt;Clique em:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; para a descarregar.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="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>&lt;b&gt;Está disponível uma nova versão do Subsurface.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</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>Ocorreu um erro na tentativa de procura de actualizações.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -2678,25 +2898,166 @@ Por favor, remova-os primeiro</translation>
 <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>Manual do utilizador</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>Não foi possível encontrar o manual do Subsurface</translation>
     </message>
 </context>
 <context>
+    <name>UserSurvey</name>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>Diálogo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="47"/>
+        <source>Subsurface User Survey</source>
+        <translation>Inquérito aos utilizadores do Subsurface</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>Gostaríamos de conhecer os nossos utilizadores, as suas preferências e os seus hábitos de utilização. Por favor, despenda um minuto a preencher este formulário e a submetê-lo à equipa do Subsurface. Por favor, seleccione todas as opções que se aplicam ao seu perfil.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="79"/>
+        <source>Recreational DIver</source>
+        <translation>Mergulhador desportivo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="92"/>
+        <source>Tech Diver</source>
+        <translation>Mergulhador técnico</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="105"/>
+        <source>Interested in dive planning</source>
+        <translation>Interesse no planeamento de mergulhos</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="118"/>
+        <source>I am downloading dives from supported dive computer</source>
+        <translation>Descarrego mergulhos de um computador de mergulho suportado</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="131"/>
+        <source>I am importing dives from other software / sources</source>
+        <translation>Importo mergulhos a partir de outro programa / outra fonte</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="144"/>
+        <source>I am manually entering dives</source>
+        <translation>Introduzo manualmente os mergulhos</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="167"/>
+        <source>I use the Android companion app to track dive locations</source>
+        <translation>Uso o Android companion app para gerir os locais de mergulho</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="190"/>
+        <source>Please type suggestions (in English) in the following box</source>
+        <translation>Por favor insira as suas sugestões (em inglês) na caixa seguinte</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="203"/>
+        <source>The following information about your system will also be submitted</source>
+        <translation>Será igualmente submetida a seguinte informação sobre o seu sistema</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="27"/>
+        <source>
+Operating System: %1</source>
+        <translation>
+Sistema operativo: %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="30"/>
+        <source>
+CPU Architecture: %1</source>
+        <translation>
+Arquitectura do CPU: %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="35"/>
+        <source>
+OS CPU Architecture %1</source>
+        <translation>Arquitectura do SO %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="39"/>
+        <source>
+Language: %1</source>
+        <translation>
+Linguagem: %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="73"/>
+        <source>Should we ask you later?</source>
+        <translation>Deveríamos perguntar-lhe mais tarde?</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="74"/>
+        <source>Don&apos;t ask me again</source>
+        <translation>Não me voltem a perguntar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="75"/>
+        <source>Ask Later</source>
+        <translation>Perguntar mais tarde</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="76"/>
+        <source>Ask again?</source>
+        <translation>Perguntar novamente?</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <source>Submit User Survey.</source>
+        <translation>Enviar questionário do utilizador.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <source>Subsurface was unable to submit the user survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="101"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="102"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="111"/>
+        <source>Survey successfully submitted.</source>
+        <translation>Questionário enviado.</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>Ocorreu um erro na tentativa de procura de actualizações.&lt;br/&gt;&lt;br/&gt;%1</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>Descrição</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="723"/>
+        <location filename="../qt-ui/models.cpp" line="721"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2744,12 +3105,12 @@ Por favor, remova-os primeiro</translation>
         <translation>Carregar</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>A operação demorou demasiado tempo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="279"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="277"/>
         <source>Transfering data...</source>
         <translation>A transferir dados...</translation>
     </message>
@@ -2757,37 +3118,37 @@ Por favor, remova-os primeiro</translation>
 <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>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="368"/>
+        <location filename="../qt-ui/models.cpp" line="373"/>
         <source>Weight</source>
         <translation>Peso</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>Ao clicar aqui irá remover este sistema de lastro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="453"/>
+        <location filename="../qt-ui/models.cpp" line="458"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="454"/>
+        <location filename="../qt-ui/models.cpp" line="459"/>
         <source>lbs</source>
         <translation>libra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="478"/>
+        <location filename="../qt-ui/models.cpp" line="483"/>
         <source>ft</source>
         <translation>pés</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="484"/>
         <source>m</source>
         <translation>m</translation>
     </message>
@@ -2795,79 +3156,79 @@ Por favor, remova-os primeiro</translation>
 <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>Ano
 &gt;Mês / Viagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1643"/>
         <source>Duration 
  Total</source>
         <translation>Duração
 Total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>
 Average</source>
         <translation>
 Média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>
 Shortest</source>
         <translation>
 Mais curto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>
 Longest</source>
         <translation>
 Mais longo</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>Profundidade (%1)
 Média</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>
 Mínimo</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>
 Máximo</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>Consumo (%1)
 Médio</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>Temperatura (%1)
@@ -2877,99 +3238,92 @@ Média</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="58"/>
+        <location filename="../dive.c" line="87"/>
         <source>pascal</source>
         <translation>pascal</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>bar</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>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="104"/>
-        <location filename="../qt-gui.cpp" line="292"/>
-        <source>l</source>
-        <translation>l</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>pés cúbicos</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>m</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>pés</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>libras</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>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1120"/>
+        <location filename="../dive.c" line="1237"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) ou (%s)</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>ar</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="170"/>
+        <location filename="../equipment.c" line="210"/>
         <source>integrated</source>
         <translation>integrado</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="171"/>
+        <location filename="../equipment.c" line="211"/>
         <source>belt</source>
         <translation>cinto</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="172"/>
+        <location filename="../equipment.c" line="212"/>
         <source>ankle</source>
         <translation>tornozelo</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="173"/>
+        <location filename="../equipment.c" line="213"/>
         <source>backplate weight</source>
         <translation>lastro no arnês</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="174"/>
+        <location filename="../equipment.c" line="214"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -2986,234 +3340,234 @@ Média</translation>
         <translation>O número máximo de colunas suportadas ao importar ficheiros CSV é %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>none</source>
         <translation>nenhum</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>deco stop</source>
         <translation>paragem de deco</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ascent</source>
         <translation>subida</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ceiling</source>
         <translation>tecto</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>workload</source>
         <translation>esforço</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>transmitter</source>
         <translation>transmissor</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>violation</source>
         <translation>transgressão</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>bookmark</source>
         <translation>marcação</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>surface</source>
         <translation>superfície</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>safety stop</source>
         <translation>paragem de segurança</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>troca de gás</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (voluntary)</source>
         <translation>paragem de segurança (voluntária)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (mandatory)</source>
         <translation>paragem de segurança (obrigatória)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>deepstop</source>
         <translation>paragem funda</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>ceiling (safety stop)</source>
         <translation>tecto (paragem de segurança)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>divetime</source>
         <translation>duração do mergulho</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>abaixo da zona de descompressão</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>maxdepth</source>
         <translation>Profundidade Máx</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>airtime</source>
         <translation>tempo de ar</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>heading</source>
         <translation>cabeçalho</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>tissue level warning</source>
         <translation>Alarme do nível nos tecidos</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>non stop time</source>
         <translation>tempo sem paragem</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="163"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>invalid event number</source>
         <translation>Número de evento inválido</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>Não é possivel criar o &quot;parser&quot; para %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="411"/>
+        <location filename="../libdivecomputer.c" line="414"/>
         <source>Error registering the data</source>
         <translation>Erro no registo de dados</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="419"/>
+        <location filename="../libdivecomputer.c" line="422"/>
         <source>Error parsing the datetime</source>
         <translation>Erro na análise da data/tempo</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="438"/>
         <source>Dive %d: %s %d %04d</source>
         <translation>Mergulho #%d:%s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="440"/>
+        <location filename="../libdivecomputer.c" line="443"/>
         <source>Error parsing the divetime</source>
         <translation>Erro na análise do tempo de mergulho</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="449"/>
+        <location filename="../libdivecomputer.c" line="452"/>
         <source>Error parsing the maxdepth</source>
         <translation>Erro na análise da profundidade máxima</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="458"/>
+        <location filename="../libdivecomputer.c" line="461"/>
         <source>Error parsing the gas mix count</source>
         <translation>Erro na análise na contagem da mistura de gás</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="470"/>
+        <location filename="../libdivecomputer.c" line="473"/>
         <source>Error obtaining water salinity</source>
         <translation>Erro na obtenção da salinidade da água</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error obtaining surface pressure</source>
         <translation>Erro na obtenção da pressão atmosférica</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the gas mix</source>
         <translation>Erro na análise da mistura de gás</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="493"/>
+        <location filename="../libdivecomputer.c" line="496"/>
         <source>Error parsing the samples</source>
         <translation>Erro na análise das amostras</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="623"/>
+        <location filename="../libdivecomputer.c" line="626"/>
         <source>Event: waiting for user action</source>
         <translation>Evento: à espera de acção do utilizador</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>modelo=%u (0x%08x), firmware=%u (0x%08x), Nº de série=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="691"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the event handler.</source>
         <translation>Erro no registo do &quot;event handler&quot;.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="696"/>
+        <location filename="../libdivecomputer.c" line="699"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Erro no registo do &quot;cancellation handler&quot;.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="717"/>
+        <location filename="../libdivecomputer.c" line="720"/>
         <source>Dive data import error</source>
         <translation>Erro a importar os dados do mergulho</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="756"/>
+        <location filename="../libdivecomputer.c" line="759"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Não é possivel criar contexto do libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="763"/>
+        <location filename="../libdivecomputer.c" line="766"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Não se consegue abrir  %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="462"/>
+        <location filename="../parse-xml.c" line="466"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Leitura estranha das percentagens %s
@@ -3221,19 +3575,19 @@ Média</translation>
 </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>Falha na análise de &apos;%s&apos;</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>A consulta &quot;obter eventos&quot; falhou.
 </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>Falha no query get_tags à base de dados.
@@ -3241,117 +3595,166 @@ Média</translation>
     </message>
     <message>
         <location filename="../file.c" line="166"/>
-        <source>Database connection failed &apos;%s&apos;.
+        <source>Database connection failed '%s'.
 </source>
         <translation>Falha na ligação à base de dados &apos;%s&apos;
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1887"/>
-        <location filename="../parse-xml.c" line="2034"/>
-        <source>Database query failed &apos;%s&apos;.
+        <location filename="../parse-xml.c" line="1945"/>
+        <location filename="../parse-xml.c" line="2092"/>
+        <source>Database query failed '%s'.
 </source>
         <translation>A consulta da base de dados falhou &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1998"/>
+        <location filename="../parse-xml.c" line="2056"/>
         <source>Database query get_cylinders failed.
 </source>
         <translation>Falha na obtenção do query get_cylinders da base de dados.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2005"/>
+        <location filename="../parse-xml.c" line="2063"/>
         <source>Database query get_changes failed.
 </source>
         <translation>Falha na obtenção do query get_changes na base de dados.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2012"/>
+        <location filename="../parse-xml.c" line="2070"/>
         <source>Database query get_profile_sample failed.
 </source>
         <translation>Falha na obtenção do query get_profile_sample da base de dados.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2103"/>
+        <location filename="../parse-xml.c" line="2161"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Não é possível abrir a folha de estilos %s</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>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="146"/>
-        <location filename="../planner.c" line="617"/>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation>Não é possível encontrar o gás %d/%d</translation>
+        <location filename="../planner.c" line="159"/>
+        <location filename="../planner.c" line="752"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation>Não foi possível encontrar o gás %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="308"/>
+        <location filename="../planner.c" line="345"/>
         <source>Too many gas mixes</source>
         <translation>Demasiadas misturas de gás</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="489"/>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation>%s
-Plano de mergulho Subsurface
-baseado em GFlow = %.0f  e  GFhigh = %.0f
-
-</translation>
+        <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>CLÁUSULA DE DESRESPONSABILIZAÇÃO/AVISO:ESTA É UMA NOVA IMPLEMENTAÇÃO DO ALGORITMO BUHLMANN E DO SEU PLANEADOR DE MERGULHOS DERIVADO AO QUAL  SÓ FORAM REALIZADOS TESTES DE FORMA LIMITADA. RECOMENDAMOS FORTEMENTE PARA NUNCA PLANEAR MERGULHOS BASEADOS SIMPLESMENTE NOS RESULTADOS OBTIDOS AQUI.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="530"/>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Transição de cota %.*f %s em %d:%02d min - runtime %d:%02u em %s
-</translation>
+        <location filename="../planner.c" line="535"/>
+        <source>based on GFlow = %d and GFhigh = %d</source>
+        <translation>Baseado num GFlow = %d e GFhigh = %d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="539"/>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Permanecer a  %.*f %s durante %d:%02d min - runtime %d:%02u a %s
-</translation>
+        <location filename="../planner.c" line="538"/>
+        <source>Subsurface dive plan</source>
+        <translation>Plano de mergulho Subsurface</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="550"/>
-        <source>Switch gas to %s
-</source>
-        <translation>Alterar gás para %s
-</translation>
+        <location filename="../planner.c" line="542"/>
+        <source>depth</source>
+        <translation>profundidade</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="558"/>
-        <source>Gas consumption:
-</source>
-        <translation>Consumo de gás:
-</translation>
+        <location filename="../planner.c" line="545"/>
+        <source>runtime</source>
+        <translation>runtime</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="569"/>
-        <source>%.0f%s of %s
-</source>
-        <translation>%.0f%s de %s
-</translation>
+        <location filename="../planner.c" line="548"/>
+        <source>duration</source>
+        <translation>duração</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="551"/>
+        <source>gas</source>
+        <translation>gás</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>Transição para %.*f %s em %d:%02d min - runtime %d:%02u on %s</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>Permanecer a %.*f %s for %d:%02d min - runtime %d:%02u on %s</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="606"/>
+        <source>%3.0f%s</source>
+        <translation>%3.0f%s</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
+        <source>%3dmin</source>
+        <translation>%3dmin</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="629"/>
+        <source>Switch gas to %s</source>
+        <translation>Mudar para %s</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="638"/>
+        <source>Gas consumption:</source>
+        <translation>Consumo de gás:</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>Aviso:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="810"/>
+        <location filename="../planner.c" line="659"/>
+        <source>this is more gas than available in the specified cylinder!</source>
+        <translation>a quantidade de gás necessária excede a quantidade disponível na garrafa!</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="664"/>
+        <source>not enough reserve for gas sharing on ascent!</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="668"/>
+        <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
+        <translation>%.0f%s (%.0f%s durante a subida planeada) de %s</translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="683"/>
+        <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="980"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1226"/>
+        <location filename="../profile.c" line="1250"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3360,70 +3763,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1229"/>
+        <location filename="../profile.c" line="1253"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1233"/>
+        <location filename="../profile.c" line="1257"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1263"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </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>SAC: %2.1fl/min
+        <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1244"/>
+        <location filename="../profile.c" line="1268"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1246"/>
+        <location filename="../profile.c" line="1270"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1272"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="1274"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="1277"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1260"/>
+        <location filename="../profile.c" line="1284"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3433,7 +3836,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1264"/>
+        <location filename="../profile.c" line="1288"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3443,402 +3846,395 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1276"/>
+        <location filename="../profile.c" line="1300"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Paragem de segurança: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1279"/>
+        <location filename="../profile.c" line="1303"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Paragem de segurança: tempo desconhecido @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="1308"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Descompressão: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
+        <location filename="../profile.c" line="1311"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Descompressão: tempo desconhecido @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1291"/>
+        <location filename="../profile.c" line="1315"/>
         <source>In deco
 </source>
         <translation>Em descompressão
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1293"/>
+        <location filename="../profile.c" line="1317"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1297"/>
+        <location filename="../profile.c" line="1321"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Descompressão:  %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1305"/>
+        <location filename="../profile.c" line="1329"/>
         <source>In deco (calc)
 </source>
         <translation>Em descompressão (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1307"/>
+        <location filename="../profile.c" line="1331"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1310"/>
+        <location filename="../profile.c" line="1334"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1313"/>
+        <location filename="../profile.c" line="1337"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Tecto calculado %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1319"/>
+        <location filename="../profile.c" line="1343"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Tecido  %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1325"/>
+        <location filename="../profile.c" line="1349"/>
         <source>heartbeat: %d
 </source>
         <translation>frequência cardíaca: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1327"/>
+        <location filename="../profile.c" line="1351"/>
         <source>bearing: %d
 </source>
         <translation>enfiamento: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1419"/>
+        <location filename="../profile.c" line="1443"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</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>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1435"/>
+        <location filename="../profile.c" line="1459"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1439"/>
+        <location filename="../profile.c" line="1463"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</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>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1454"/>
+        <location filename="../profile.c" line="1478"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="273"/>
+        <location filename="../qt-gui.cpp" line="281"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="276"/>
+        <location filename="../qt-gui.cpp" line="284"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="392"/>
-        <source>%1, %2 %3, %4 %5:%6</source>
-        <translation>%1, %2 %3, %4 %5:%6</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="405"/>
-        <source>%1 %2, %3
-%4:%5</source>
-        <translation>%1 %2, %3
-%4:%5</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="418"/>
+        <location filename="../qt-gui.cpp" line="417"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 mergulhos)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="423"/>
+        <location filename="../qt-gui.cpp" line="422"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 mergulho)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>boat</source>
         <translation>barco</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>shore</source>
         <translation>costa</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>drift</source>
         <translation>à deriva</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>deep</source>
         <translation>profundo</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>cavern</source>
         <translation>caverna</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>ice</source>
         <translation>gelo</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>wreck</source>
         <translation>naufrágio</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>cave</source>
         <translation>gruta</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>altitude</source>
         <translation>em altitude</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>pool</source>
         <translation>piscina</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>lake</source>
         <translation>lago</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>river</source>
         <translation>rio</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>night</source>
         <translation>nocturno</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>fresh</source>
         <translation>água doce</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>student</source>
         <translation>aluno</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>photo</source>
         <translation>foto</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>video</source>
         <translation>vídeo</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>instructor</source>
         <translation>instrutor</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="25"/>
         <source>deco</source>
         <translation>descompressão</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="216"/>
+        <location filename="../dive.c" line="133"/>
+        <source>ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="214"/>
         <source>more than %d days</source>
         <translation>mais de %d dias</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="220"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd, %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="224"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="235"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation>para mergulhos #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="242"/>
+        <location filename="../statistics.c" line="240"/>
         <source>for selected dives</source>
         <translation>para mergulhos seleccionados</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="275"/>
         <source>for dive #%d</source>
         <translation>para mergulho #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for selected dive</source>
         <translation>para mergulho seleccionado</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for all dives</source>
         <translation>para todos os mergulhos</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="283"/>
+        <location filename="../statistics.c" line="281"/>
         <source>(no dives)</source>
         <translation>(nenhum mergulho)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Mon</source>
         <translation>Seg</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Tue</source>
         <translation>Ter</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Wed</source>
         <translation>Qua</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Thu</source>
         <translation>Qui</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Fri</source>
         <translation>Sex</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sat</source>
         <translation>Sáb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Feb</source>
         <translation>Fev</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Apr</source>
         <translation>Abr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Aug</source>
         <translation>Ago</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Sep</source>
         <translation>Set</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Oct</source>
         <translation>Out</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Dec</source>
         <translation>Dez</translation>
     </message>
@@ -3868,97 +4264,97 @@ Is the Uemis Zurich plugged in correctly?</source>
 O Uemis Zurich está bem ligado?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="107"/>
+        <location filename="../uemis-downloader.c" line="111"/>
         <source>unknown</source>
         <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="379"/>
+        <location filename="../uemis-downloader.c" line="383"/>
         <source>Reading %s %s</source>
         <translation>A ler %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="399"/>
+        <location filename="../uemis-downloader.c" line="403"/>
         <source>data</source>
         <translation>dados</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="420"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>divelog entry id</source>
         <translation>identificador no diário de mergulho</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="422"/>
+        <location filename="../uemis-downloader.c" line="426"/>
         <source>divespot data id</source>
         <translation>identificação do local de mergulho</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
+        <location filename="../uemis-downloader.c" line="428"/>
         <source>more data dive id</source>
         <translation>mais dados do identificador de mergulho</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>wetsuit</source>
         <translation>fato húmido</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>semidry</source>
         <translation>semi-seco</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>drysuit</source>
         <translation>fato seco</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>shorty</source>
         <translation>short</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>vest</source>
         <translation>casaco</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>long john</source>
         <translation>long john</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>jacket</source>
         <translation>colete</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>full suit</source>
         <translation>fato completo</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>2 pcs full suit</source>
         <translation>Fato completo 2 peças</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="620"/>
+        <location filename="../uemis-downloader.c" line="624"/>
         <source>membrane</source>
         <translation>membrana</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="802"/>
+        <location filename="../uemis-downloader.c" line="823"/>
         <source>Init Communication</source>
         <translation>Iniciar Comunicação</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="804"/>
+        <location filename="../uemis-downloader.c" line="825"/>
         <source>Uemis init failed</source>
         <translation>Falha ao iniciar Uemis</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="815"/>
+        <location filename="../uemis-downloader.c" line="836"/>
         <source>Start download</source>
         <translation>Começar transferência</translation>
     </message>
@@ -3979,18 +4375,18 @@ O Uemis Zurich está bem ligado?</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="203"/>
-        <source>PO2 Green Warning</source>
-        <translation>Aviso Verde PpO2</translation>
+        <source>pO₂ Green Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
-        <source>PO2 Ascend Warning</source>
-        <translation>Aviso de subida PpO2</translation>
+        <source>pO₂ Ascend Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="208"/>
-        <source>PO2 Ascend Alarm</source>
-        <translation>Alarme de Subida PpO2</translation>
+        <source>pO₂ Ascend Alarm</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
@@ -4052,5 +4448,214 @@ O Uemis Zurich está bem ligado?</translation>
         <source>Low Battery Alert</source>
         <translation>Alerta de Bateria Baixa</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>Não é possível abrir o ficheiro %s</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="36"/>
+        <source>Date:</source>
+        <translation>Data:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="38"/>
+        <source>Time:</source>
+        <translation>Tempo;</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="40"/>
+        <source>Duration:</source>
+        <translation>Duração:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="41"/>
+        <source>min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="43"/>
+        <source>Max Depth:</source>
+        <translation>Profundidade máxima:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="46"/>
+        <source>Air Temp:</source>
+        <translation>Temperatura do ar:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="48"/>
+        <source>Water Temp:</source>
+        <translation>Temperatura da água:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="50"/>
+        <source>Location:</source>
+        <translation>Local:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="54"/>
+        <source>Notes:</source>
+        <translation>Notas:</translation>
+    </message>
+</context>
+<context>
+    <name>plannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulário</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="35"/>
+        <source>Rates</source>
+        <translation>Velocidades</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="56"/>
+        <source>Ascent</source>
+        <translation>Subida</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="77"/>
+        <source>below 75% avg. depth</source>
+        <translation>abaixo de 75% da profundidade média</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>m/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="94"/>
+        <source>75%-50% avg. depth</source>
+        <translation>75%-50% da profundidade média</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="111"/>
+        <source>50% avg. depth - 6m/20ft</source>
+        <translation>50% da profundidade média - 6 m/20 ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="128"/>
+        <source>6m/20ft to surface</source>
+        <translation>6 m/20 ft para a superfície</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="148"/>
+        <source>Descent</source>
+        <translation>Descida</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="200"/>
+        <source>surface to the bottom</source>
+        <translation>superfície para o fundo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="226"/>
+        <source>Planning</source>
+        <translation>Planeamento</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="247"/>
+        <source>GF low</source>
+        <translation>GF low</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="264"/>
+        <source>GF high</source>
+        <translation>GF high</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
+        <source>Drop to first depth</source>
+        <translation>Descer para a primeira profundidade</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
+        <source>Last Stop at 6m/20ft</source>
+        <translation>Última paragem aos 6 m/20 ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>plan backgas breaks</source>
+        <translation>planear intervalos na mistura de fundo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="318"/>
+        <source>Gas Options</source>
+        <translation>Opções de gás</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <source>bottom SAC</source>
+        <translation>SAC no fundo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="349"/>
+        <source>deco SAC</source>
+        <translation>SAC na descompressão</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="359"/>
+        <source>bottom pO₂</source>
+        <translation>pO₂ no fundo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="389"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="382"/>
+        <source>deco pO₂</source>
+        <translation>pO₂ na descompressão</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="421"/>
+        <source>Dive Notes</source>
+        <translation>Notas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+        <source>In dive plan, show runtime (absolute time) of stops</source>
+        <translation>Mostrar runtime (tempo absoluto) das paragens no plano de mergulho </translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="445"/>
+        <source>display runtime</source>
+        <translation>mostrar runtime</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="458"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
+        <translation>Mostrar duração (tempo relativo) das paragens no plano de mergulho</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="461"/>
+        <source>display segment duration</source>
+        <translation>mostrar duração dos segmentos</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="471"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
+        <translation>Listar as transições no plano de mergulho ou tratá-las como implícitas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="474"/>
+        <source>display transitions in deco</source>
+        <translation>mostrar </translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="481"/>
+        <source>verbatim diveplan</source>
+        <translation>Plano de mergulho verbal</translation>
+    </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/subsurface_ro_RO.ts b/translations/subsurface_ro_RO.ts
index 7f9a0509a..7cb7ecd0e 100644
--- a/translations/subsurface_ro_RO.ts
+++ b/translations/subsurface_ro_RO.ts
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="ro_RO">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="ro_RO" version="2.0">
+<defaultcodec>UTF-8</defaultcodec>
 <context>
     <name>CylindersModel</name>
     <message>
@@ -39,42 +38,42 @@
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="71"/>
+        <location filename="../qt-ui/models.cpp" line="70"/>
         <source>Switch at</source>
         <translation>Schimbă la</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>Făcând click aici veți înlătura acest tub.</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>Tubul nu poate fi înlăturat</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>Acest gaz este in uz. Doar tuburile care nu sunt folosite în timpul scufundării pot fi înlăturate.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="507"/>
         <source>psi</source>
         <translation>livre pe inch pătrat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="508"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="527"/>
+        <location filename="../qt-ui/models.cpp" line="532"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="528"/>
+        <location filename="../qt-ui/models.cpp" line="533"/>
         <source>cuft</source>
         <translation>picioare cubice</translation>
     </message>
@@ -102,22 +101,22 @@ computerul de scufundări selectat?</translation>
 <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>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Device ID</source>
         <translation>ID-ul dispozitivului</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Nickname</source>
         <translation>Alias</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>Făcând click aici veți înlătura acest computer de scufundări.</translation>
     </message>
@@ -125,190 +124,326 @@ computerul de scufundări selectat?</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="90"/>
-        <source>air</source>
-        <translation>aer</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="92"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</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>
+        <translation type="unfinished"/>
     </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>început</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>sfârșit</translation>
     </message>
 </context>
 <context>
-    <name>DiveGasPressureItem</name>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="475"/>
-        <source>air</source>
-        <translation>aer</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="476"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-</context>
-<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1258"/>
-        <source> l/min</source>
-        <translation>l/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
-        <source> cuft/min</source>
-        <translation>picioare cubice/min</translation>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <source>/min</source>
+        <translation>/min</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>Arată Căsuța de Căutare</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="706"/>
         <source>expand all</source>
         <translation>extinde tot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="740"/>
+        <location filename="../qt-ui/divelistview.cpp" line="707"/>
         <source>collapse all</source>
         <translation>restrânge tot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="741"/>
+        <location filename="../qt-ui/divelistview.cpp" line="708"/>
         <source>collapse others</source>
         <translation>restrânge-le pe celelalte</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>șterge scufundarea (ările) din excursie</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>creează o nouă excursie deasupra</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>îmbină excursia cu excursia de deasupra</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>îmbină excursia cu excursia de dedesupt</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>șterge scufundarea (ările)</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
-        <source>save As</source>
-        <translation>salvează ca</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="744"/>
+        <source>renumber dive(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="763"/>
-        <source>export As UDDF</source>
-        <translation>exportă ca UDDF</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <source>shift times</source>
+        <translation>mută timpurile</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="764"/>
-        <source>export As CSV</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <source>load images</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="765"/>
-        <source>shift times</source>
-        <translation>mută timpurile</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Open Image Files</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="766"/>
-        <source>load images</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <source>merge selected dives</source>
+        <translation>îmbină scufundările selectate</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="769"/>
-        <source>upload dive(s) to divelogs.de</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="24"/>
+        <source>General Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="30"/>
+        <source>Export format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="42"/>
+        <source>Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="61"/>
+        <source>UDDF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="74"/>
+        <source>divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="84"/>
+        <source>CSV</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="94"/>
+        <source>Worldmap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="107"/>
+        <source>Selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="116"/>
+        <source>Selected dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="126"/>
+        <source>All dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="178"/>
+        <source>HTML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="184"/>
+        <source>General Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="190"/>
+        <source>Subsurface Numbers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="203"/>
+        <source>Selected Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="216"/>
+        <source>Minimum Javascript</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="229"/>
+        <source>All Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="239"/>
+        <source>Export List only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="252"/>
+        <source>Style Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="264"/>
+        <source>Font</source>
+        <translation>Font</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="274"/>
+        <source>Font size</source>
+        <translation>Mărimea fontului</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="795"/>
-        <source>Save Dives As...</source>
-        <translation>Salvează Scufundările ca...</translation>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
+        <source>8</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="814"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <source>10</source>
+        <translation>10</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <source>12</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <source>14</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <source>16</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <source>18</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <source>20</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="323"/>
+        <source>Theme</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <source>Sand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="153"/>
         <source>Export UDDF File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>Fișiere UDDF (*.uddf *.UDDF)</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Open Image Files</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="162"/>
+        <source>Export World Map</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="163"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="177"/>
+        <source>HTML files (*.html)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="760"/>
-        <source>merge selected dives</source>
-        <translation>îmbină scufundările selectate</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="167"/>
+        <source>Export Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="168"/>
+        <source>XML files (*.xml *.ssrf)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="176"/>
+        <source>Export HTML files as</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -316,141 +451,136 @@ computerul de scufundări selectat?</translation>
     <message>
         <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
         <source>Import dive log file</source>
-        <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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>Separator de Câmpuri</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>
+        <translation type="unfinished"/>
     </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>Configurația Câmpurilor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="80"/>
         <source>Depth</source>
         <translation>Adâncime</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="107"/>
         <source>PO2</source>
         <translation>PO2</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>Timp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="121"/>
         <source>Temp</source>
         <translation>Temp</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>
+        <translation type="unfinished"/>
     </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>Unități</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>Metric</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>Imperial</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="317"/>
         <source>Date</source>
         <translation>Dată</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="385"/>
         <source>Duration</source>
         <translation>Durată</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="470"/>
         <source>Tags</source>
         <translation>Etichete</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
         <source>Location</source>
         <translation>Locație</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="368"/>
         <source>Buddy</source>
         <translation>Companion</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="402"/>
         <source>Notes</source>
         <translation>Notițe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="436"/>
         <source>Weight</source>
         <translation>Greutate</translation>
     </message>
@@ -458,105 +588,70 @@ computerul de scufundări selectat?</translation>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="71"/>
-        <source>Bottom SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="85"/>
-        <source>SAC on DECO Stop</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/diveplanner.ui" line="106"/>
+        <source>Planned Dive Time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="78"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="134"/>
+        <source>Altitude</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="98"/>
-        <source>GFLow</source>
-        <translation>GFLow</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="125"/>
-        <source>Last Stop at 6m</source>
-        <translation>Ultima oprire la 6m</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="174"/>
-        <source>Start Time</source>
-        <translation>Timp Începere</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="181"/>
+        <location filename="../qt-ui/diveplanner.ui" line="141"/>
         <source>ATM Pressure</source>
         <translation>Presiune ATM</translation>
     </message>
-</context>
-<context>
-    <name>DivePlannerGraphics</name>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="114"/>
-        <source>10m</source>
-        <translation>10m</translation>
-    </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="116"/>
-        <source>30ft</source>
-        <translation>30 de picioare</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="148"/>
+        <source>mbar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="363"/>
-        <source>Handler Position Error</source>
-        <translation>Eroare cauzată de Handlerul Poziției</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>
-        <translation>Una sau mai multe din opririle dumneavoastră vor fi pierdute după această operație,
-Vă rugăm, înlăturați-le mai întâi.</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="158"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="445"/>
-        <source>AIR</source>
-        <translation>AER</translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="137"/>
+        <source>unknown</source>
+        <translation>necunoscut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1148"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="586"/>
         <source>Final Depth</source>
         <translation>Adâncime Finală</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1152"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="590"/>
         <source>Duration</source>
         <translation>Durată</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1154"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="592"/>
         <source>Used Gas</source>
         <translation>Gaz Folosit</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1391"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="887"/>
         <source>Discard the Plan?</source>
         <translation>Înlăturați Planul?</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>Sunteți pe cale de a șterge planul.</translation>
     </message>
@@ -564,17 +659,17 @@ Vă rugăm, înlăturați-le mai întâi.</translation>
 <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>Puncte Planificator Scufundări</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="256"/>
         <source>Available Gases</source>
         <translation>Gaze Disponibile</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>adaugă punct de date pentru scufundare</translation>
     </message>
@@ -604,118 +699,118 @@ Vă rugăm, înlăturați-le mai întâi.</translation>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/>
         <source>Color</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
         <source>User Entered</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
         <source>Cylinder Index</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
-        <source>Pressure  S</source>
-        <translation type="unfinished"></translation>
+        <source>Pressure S</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <source>pN₂</source>
+        <translation>pN₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>pHe</source>
+        <translation>pHe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Pressure I</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
         <source>Ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
-        <source>PN2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <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="119"/>
-        <source>PO2</source>
-        <translation>PO2</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>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>date</source>
         <translation>data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>ft</source>
         <translation>picioare</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1298"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>lbs</source>
         <translation>livre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
+        <location filename="../qt-ui/models.cpp" line="1307"/>
         <source>suit</source>
         <translation>costum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1310"/>
         <source>cyl</source>
         <translation>tub</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1344"/>
+        <location filename="../qt-ui/models.cpp" line="1325"/>
         <source>location</source>
         <translation>locația</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1316"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1338"/>
+        <location filename="../qt-ui/models.cpp" line="1319"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1341"/>
+        <location filename="../qt-ui/models.cpp" line="1322"/>
         <source>maxCNS</source>
         <translation>maxCNS</translation>
     </message>
@@ -723,115 +818,115 @@ Vă rugăm, înlăturați-le mai întâi.</translation>
 <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>Răspuns invalid de la server</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>Tag XML așteptat „DiveDateReader”, dar s-a întâmpinat „%1”</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>Tag-ul XML așteptat „DiveDates” nu a fost găsit</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>
+        <translation type="unfinished"/>
     </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>nu a fost selectată nicio scufundare</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="181"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="179"/>
         <source>internal error</source>
         <translation>eroare internă</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>Finalizat</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>Se uploadează lista de scufundări...</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>Se descarcă lista de scufundări...</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="791"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/>
         <source>Download finished - %1</source>
         <translation>Descărcarea s-a terminat - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
         <source>Corrupted download</source>
         <translation>Descărcarea a fost coruptă.</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>Arhiva nu a putut fi deschisăȘ
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Upload failed</source>
         <translation>Upload-ul a eșuat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="849"/>
         <source>Upload successful</source>
         <translation>Upload-ul a avut succes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="854"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="852"/>
         <source>Login failed</source>
         <translation>Logarea a eșuat</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>Nu s-a putut parsa răspunsul</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="868"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Error: %1</source>
         <translation>Eroare: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="835"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/>
         <source>Upload finished</source>
         <translation>Upload-ul a fost finalizat</translation>
     </message>
@@ -839,54 +934,54 @@ Vă rugăm, înlăturați-le mai întâi.</translation>
 <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>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="165"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/>
         <source>Error</source>
         <translation>Eroare</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>Reîncearcă</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="323"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="325"/>
         <source>Log files (*.log)</source>
         <translation>Fișiere de log (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="339"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
         <source>Warning</source>
         <translation>Avertizare</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>
+        <translation type="unfinished"/>
     </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>Selectați fișierul pentru a salva dump-ul binar al computerului de scufundări</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="353"/>
         <source>Dump files (*.bin)</source>
         <translation>Fișiere dump (*.bin)</translation>
     </message>
@@ -954,854 +1049,860 @@ Vă rugăm, înlăturați-le mai întâi.</translation>
 <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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <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>Notițele Scufundării</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>Locație</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="148"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Coordinates</source>
         <translation>Coordonate</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="169"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
         <source>Divemaster</source>
         <translation>Maestru scufundare</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="155"/>
+        <location filename="../qt-ui/maintab.ui" line="148"/>
         <source>Buddy</source>
         <translation>Companion</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="63"/>
-        <source>Start time</source>
-        <translation>Timp început</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>Temperatura aerului</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>Temperatura apei</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="127"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Tags</source>
         <translation>Etichete</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="223"/>
         <source>Rating</source>
         <translation>Rating</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="236"/>
         <source>Visibility</source>
         <translation>Vizibilitate</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="215"/>
+        <location filename="../qt-ui/maintab.ui" line="127"/>
         <source>Suit</source>
         <translation>Costum</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>Notițe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="270"/>
+        <location filename="../qt-ui/maintab.ui" line="311"/>
         <source>Equipment</source>
         <translation>Echipament</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="350"/>
+        <location filename="../qt-ui/maintab.ui" line="391"/>
         <source>Dive Info</source>
         <translation>Informații despre scufundare</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>Dată</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="414"/>
+        <location filename="../qt-ui/maintab.ui" line="275"/>
+        <source>Time</source>
+        <translation>Timp</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="455"/>
         <source>Interval</source>
         <translation>Interval</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="433"/>
+        <location filename="../qt-ui/maintab.ui" line="474"/>
         <source>Gases Used</source>
         <translation>Gaze Utilizate</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="452"/>
+        <location filename="../qt-ui/maintab.ui" line="493"/>
         <source>Gas Consumed</source>
         <translation>Gaz Consumat</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>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="531"/>
         <source>Max. Depth</source>
         <translation>Adâncime Maximă</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="509"/>
+        <location filename="../qt-ui/maintab.ui" line="550"/>
         <source>Ave. Depth</source>
         <translation>Adâncime Medie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="528"/>
+        <location filename="../qt-ui/maintab.ui" line="569"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="547"/>
+        <location filename="../qt-ui/maintab.ui" line="588"/>
         <source>Air Pressure</source>
         <translation>Presiunea Aerului</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="566"/>
+        <location filename="../qt-ui/maintab.ui" line="607"/>
         <source>Air Temperature</source>
         <translation>Temperatura Aerului</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="585"/>
+        <location filename="../qt-ui/maintab.ui" line="626"/>
         <source>Water Temperature</source>
         <translation>Temperatura Apei</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="604"/>
+        <location filename="../qt-ui/maintab.ui" line="645"/>
         <source>Dive Time</source>
         <translation>Timpul Scufundării</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="623"/>
+        <location filename="../qt-ui/maintab.ui" line="664"/>
         <source>Salinity</source>
         <translation>Salinitate</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="660"/>
+        <location filename="../qt-ui/maintab.ui" line="701"/>
         <source>Stats</source>
         <translation>Statistici</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="746"/>
         <source>Depth</source>
         <translation>Adâncime</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Temperature</source>
         <translation>Temperatură</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="784"/>
         <source>Duration</source>
         <translation>Durată</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Total Time</source>
         <translation>Timp Total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="835"/>
         <source>Dives</source>
         <translation>Scufundări</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="919"/>
+        <source>Photos</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="89"/>
         <source>Cylinders</source>
         <translation>Tub</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="90"/>
         <source>Add Cylinder</source>
         <translation>Adaugă Tub</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="93"/>
         <source>Weights</source>
         <translation>Greutăți</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>Adaugă Sistem de Greutăți</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="438"/>
+        <location filename="../qt-ui/maintab.cpp" line="409"/>
         <source>Trip Location</source>
         <translation>Locația Excursiei</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>Notițele Excursiei</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="42"/>
+        <location filename="../qt-ui/maintab.cpp" line="48"/>
         <source>Save</source>
         <translation>Înregistrare</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="46"/>
+        <location filename="../qt-ui/maintab.cpp" line="52"/>
         <source>Cancel</source>
         <translation>Anulează</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>Această scufundare este editată</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>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="494"/>
+        <location filename="../qt-ui/maintab.cpp" line="464"/>
         <source>unknown</source>
         <translation>necunoscut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>N</source>
-        <translation>N</translation>
+        <location filename="../qt-ui/maintab.cpp" line="501"/>
+        <source>Deepest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>S</source>
-        <translation>S</translation>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <source>Shallowest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>E</source>
-        <translation>E</translation>
+        <location filename="../qt-ui/maintab.cpp" line="794"/>
+        <source>Discard the Changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>W</source>
-        <translation>V</translation>
+        <location filename="../qt-ui/maintab.cpp" line="795"/>
+        <source>You are about to discard your changes.</source>
+        <translation type="unfinished"/>
     </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>Filtrează</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="571"/>
+        <location filename="../qt-ui/mainwindow.ui" line="646"/>
         <source>&amp;File</source>
         <translation>&amp;Fișier</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="583"/>
+        <source>Print</source>
+        <translation>Printează</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:'Courier'; 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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="628"/>
+        <location filename="../qt-ui/mainwindow.ui" line="701"/>
         <source>&amp;Help</source>
         <translation>&amp;Ajutor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="636"/>
+        <location filename="../qt-ui/mainwindow.ui" line="709"/>
         <source>&amp;Import</source>
         <translation>&amp;Importați</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>&amp;Jurnal nou</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="655"/>
+        <location filename="../qt-ui/mainwindow.ui" line="728"/>
         <source>New</source>
         <translation>Nou</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="658"/>
+        <location filename="../qt-ui/mainwindow.ui" line="731"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</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>&amp;Deschide jurnal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="666"/>
+        <location filename="../qt-ui/mainwindow.ui" line="739"/>
         <source>Open</source>
         <translation>Deschide</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <location filename="../qt-ui/mainwindow.ui" line="742"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="674"/>
+        <location filename="../qt-ui/mainwindow.ui" line="747"/>
         <source>&amp;Save</source>
         <translation>&amp;Salvează</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="677"/>
+        <location filename="../qt-ui/mainwindow.ui" line="750"/>
         <source>Save</source>
         <translation>Salvează</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="680"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>Save as</source>
         <translation>Salvează ca</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>Ctrl+Shift+S</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>&amp;Închide</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Close</source>
         <translation>Închide</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="702"/>
+        <location filename="../qt-ui/mainwindow.ui" line="775"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="902"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <source>P&amp;references</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="831"/>
+        <source>&amp;Add Dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <source>Auto &amp;Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="863"/>
+        <source>&amp;Dive List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="871"/>
+        <source>&amp;Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="879"/>
+        <source>&amp;Info</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="887"/>
+        <source>&amp;All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="895"/>
+        <source>P&amp;rev DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="903"/>
+        <source>&amp;Next DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="911"/>
+        <source>&amp;Select Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <source>&amp;About Subsurface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="937"/>
+        <source>&amp;Globe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="953"/>
+        <source>&amp;Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="959"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="707"/>
-        <source>Export &amp;UDDF</source>
-        <translation>Exportă &amp;UDDF</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="1008"/>
+        <source>&amp;Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1011"/>
+        <source>Export Dive Logs</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1014"/>
+        <source>Ctrl+E</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Enable the pN2 Graph</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <location filename="../qt-ui/mainwindow.ui" line="128"/>
         <source>Enable the pHe graph</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <location filename="../qt-ui/mainwindow.ui" line="290"/>
         <source>Show/hide heart rate</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <location filename="../qt-ui/mainwindow.ui" line="342"/>
         <source>Enable EAD, END, and EADD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="238"/>
         <source>Show NDL / TTS</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="456"/>
+        <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="710"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="715"/>
-        <source>Export HTML World Map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="718"/>
-        <source>Ctrl+H</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="723"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>&amp;Print</source>
         <translation>&amp;Printează</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="734"/>
+        <location filename="../qt-ui/mainwindow.ui" line="791"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="742"/>
+        <location filename="../qt-ui/mainwindow.ui" line="799"/>
         <source>&amp;Quit</source>
         <translation>&amp;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="753"/>
+        <location filename="../qt-ui/mainwindow.ui" line="810"/>
         <source>Import from &amp;dive computer</source>
         <translation>Importă din computerul de &amp;scufundări</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="818"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation>Importă date &amp;GPS de la Serviciul Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="764"/>
+        <location filename="../qt-ui/mainwindow.ui" line="821"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="826"/>
         <source>&amp;Edit Device Names</source>
         <translation>&amp;Editează Numele Dispozitivului</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="834"/>
         <source>Ctrl++</source>
         <translation>Ctr++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="782"/>
+        <location filename="../qt-ui/mainwindow.ui" line="839"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Renumerotează</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="785"/>
+        <location filename="../qt-ui/mainwindow.ui" line="842"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="798"/>
+        <location filename="../qt-ui/mainwindow.ui" line="855"/>
         <source>&amp;Yearly Statistics</source>
         <translation>&amp;Statistici Anuale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="801"/>
+        <location filename="../qt-ui/mainwindow.ui" line="858"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="806"/>
-        <source>Dive List</source>
-        <translation>Listă de scufundări</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="814"/>
-        <source>Profile</source>
-        <translation>Profil</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="822"/>
-        <source>Info</source>
-        <translation>Informații</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="830"/>
-        <source>All</source>
-        <translation>Toate</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="872"/>
+        <location filename="../qt-ui/mainwindow.ui" line="929"/>
         <source>User &amp;Manual</source>
         <translation>&amp;Manual Utilizator</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="880"/>
-        <source>Globe</source>
-        <translation>Harta</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="888"/>
+        <location filename="../qt-ui/mainwindow.ui" line="945"/>
         <source>P&amp;lan Dive</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="891"/>
+        <location filename="../qt-ui/mainwindow.ui" line="948"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="907"/>
-        <source>Import from Divelogs.de</source>
-        <translation>Importă de la Divelogs.de</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1003"/>
         <source>&amp;Check for Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="951"/>
-        <source>Export CSV</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="726"/>
+        <location filename="../qt-ui/mainwindow.ui" line="783"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</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"/>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="131"/>
+        <location filename="../qt-ui/mainwindow.ui" line="157"/>
+        <location filename="../qt-ui/mainwindow.ui" line="186"/>
+        <location filename="../qt-ui/mainwindow.ui" line="215"/>
+        <location filename="../qt-ui/mainwindow.ui" line="241"/>
+        <location filename="../qt-ui/mainwindow.ui" line="267"/>
+        <location filename="../qt-ui/mainwindow.ui" line="293"/>
+        <location filename="../qt-ui/mainwindow.ui" line="319"/>
+        <location filename="../qt-ui/mainwindow.ui" line="345"/>
+        <location filename="../qt-ui/mainwindow.ui" line="371"/>
+        <location filename="../qt-ui/mainwindow.ui" line="397"/>
+        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>...</source>
         <translation>...</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>Preferințe</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="745"/>
+        <location filename="../qt-ui/mainwindow.ui" line="802"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="756"/>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="774"/>
-        <source>Add Dive</source>
-        <translation>Adaugă Scufundare</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="793"/>
-        <source>Auto Group</source>
-        <translation>Grupează Automat</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="809"/>
+        <location filename="../qt-ui/mainwindow.ui" line="866"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="817"/>
+        <location filename="../qt-ui/mainwindow.ui" line="874"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <location filename="../qt-ui/mainwindow.ui" line="882"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="833"/>
+        <location filename="../qt-ui/mainwindow.ui" line="890"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="838"/>
-        <source>Prev DC</source>
-        <translation>CS Anterior</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="841"/>
+        <location filename="../qt-ui/mainwindow.ui" line="898"/>
         <source>Left</source>
         <translation>Stânga</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="846"/>
-        <source>Next DC</source>
-        <translation>Următorul CS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="849"/>
+        <location filename="../qt-ui/mainwindow.ui" line="906"/>
         <source>Right</source>
         <translation>Dreapta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="854"/>
-        <source>Select Events</source>
-        <translation>Selectează Evenimente</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <location filename="../qt-ui/mainwindow.ui" line="916"/>
         <source>Input Plan</source>
         <translation>Introduceți Plan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="864"/>
-        <source>About Subsurface</source>
-        <translation>Despre Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="875"/>
+        <location filename="../qt-ui/mainwindow.ui" line="932"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="883"/>
+        <location filename="../qt-ui/mainwindow.ui" line="940"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="896"/>
-        <source>Import Log Files</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/mainwindow.ui" line="956"/>
+        <source>Import divelog files from other applications</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="899"/>
-        <source>Import divelog files from other applications</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/mainwindow.ui" line="964"/>
+        <source>Import &amp;from Divelogs.de</source>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <location filename="../qt-ui/mainwindow.ui" line="978"/>
         <source>F11</source>
-        <translation type="unfinished">F11</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="174"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
         <source>Open File</source>
         <translation>Deschide Fișier</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>Vă rugăm salvați sau anulați editarea scufundării curente înainte de a închide fișierul.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="330"/>
-        <source>Please save or cancel the current dive edit before trying to plan a dive.</source>
-        <translation>Vă rugăm salvați sau anulați editarea scufundării curente înainte de a încerca să planificați o scufundare.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="396"/>
+        <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>Vă rugăm salvați sau anulați editarea scufundării curente înainte de a încerca să adăugați o scufundare.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="645"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="419"/>
+        <source>Print runtime table</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="710"/>
         <source>Do you want to save the changes you made in the file %1?</source>
         <translation>Doriți să salvați modificările făcute în fișierul %1?</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>Doriți să salvați modificările făcute în fișierul de date?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="652"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="717"/>
         <source>Save Changes?</source>
         <translation>Salvați Modificările?</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>Modificările vor fi pierdute dacă nu le salvați.</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>Salvează Fișierul ca</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>Avertizare</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>Vă rugăm salvați sau anulați editarea scufundării curente înainte de a deschide un nou fișier.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="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>Fișiere UDDF (*.uddf *.UDDF)</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>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="300"/>
-        <source>HTML files (*.html)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="449"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="514"/>
         <source>Yearly Statistics</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="961"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1076"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Fișiere XML Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1199"/>
         <source>Open Dive Log File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1107"/>
+        <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>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PlannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Last stop at 20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="416"/>
+        <source>Last stop at 6m</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1827,247 +1928,297 @@ Vă rugăm, înlăturați-le mai întâi.</translation>
         <translation>Limba</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="151"/>
         <source>Lists and Tables</source>
         <translation>Liste și Tabele</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="167"/>
         <source>Font size</source>
         <translation>Mărimea fontului</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="170"/>
+        <location filename="../qt-ui/preferences.ui" line="180"/>
         <source>Dives</source>
         <translation>Scufundări</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>Fișier de Scufundări Implicit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="188"/>
+        <location filename="../qt-ui/preferences.ui" line="198"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="197"/>
+        <location filename="../qt-ui/preferences.ui" line="207"/>
         <source>Display Invalid</source>
         <translation>Afișaj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="214"/>
+        <location filename="../qt-ui/preferences.ui" line="224"/>
         <source>Default Cylinder</source>
         <translation>Tub implicit</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>Folosește Tubul Implicit</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <source>Clear all settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="312"/>
+        <source>Reset all settings to their default value</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
         <source>System</source>
         <translation>Sistem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="348"/>
         <source>Metric</source>
         <translation>Metric</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="333"/>
+        <location filename="../qt-ui/preferences.ui" line="358"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="343"/>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
         <source>Personalize</source>
         <translation>Personalizați</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="392"/>
         <source>Depth</source>
         <translation>Adâncime</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="374"/>
+        <location filename="../qt-ui/preferences.ui" line="399"/>
         <source>meter</source>
         <translation>metru</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="409"/>
         <source>feet</source>
         <translation>picioare</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="401"/>
+        <location filename="../qt-ui/preferences.ui" line="426"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="411"/>
+        <location filename="../qt-ui/preferences.ui" line="436"/>
         <source>psi</source>
         <translation>livre pe inch pătrat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="428"/>
+        <location filename="../qt-ui/preferences.ui" line="453"/>
         <source>liter</source>
         <translation>litru</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="438"/>
+        <location filename="../qt-ui/preferences.ui" line="463"/>
         <source>cu ft</source>
         <translation>picioare cubice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="455"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>celsius</source>
         <translation>Celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="465"/>
+        <location filename="../qt-ui/preferences.ui" line="490"/>
         <source>fahrenheit</source>
         <translation>Fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="482"/>
+        <location filename="../qt-ui/preferences.ui" line="507"/>
         <source>kg</source>
         <translation>kg</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="636"/>
-        <source>max ppO₂ when showing MOD</source>
-        <translation type="unfinished"></translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="811"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="657"/>
+        <location filename="../qt-ui/preferences.ui" line="817"/>
+        <source>Proxy type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="830"/>
+        <source>Host</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="856"/>
+        <source>Port</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="882"/>
+        <source>Requires authentication</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="925"/>
+        <source>Password</source>
+        <translation>Parola</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="682"/>
         <source>draw dive computer reported ceiling red</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="767"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>Filter</source>
         <translation>Filtrează</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="419"/>
         <source>Pressure</source>
         <translation>Presiune</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="421"/>
+        <location filename="../qt-ui/preferences.ui" line="446"/>
         <source>Volume</source>
         <translation>Volum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="448"/>
+        <location filename="../qt-ui/preferences.ui" line="473"/>
         <source>Temperature</source>
         <translation>Temperatură</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="475"/>
+        <location filename="../qt-ui/preferences.ui" line="500"/>
         <source>Weight</source>
         <translation>Greutate</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="517"/>
         <source>lbs</source>
         <translation>livre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="507"/>
+        <location filename="../qt-ui/preferences.ui" line="532"/>
         <source>Time units</source>
         <translation>Unități de timp</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>Numitorul vitezei de ascensiune/coborâre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="520"/>
+        <location filename="../qt-ui/preferences.ui" line="545"/>
         <source>Minutes</source>
         <translation>Minute</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="530"/>
+        <location filename="../qt-ui/preferences.ui" line="555"/>
         <source>Seconds</source>
         <translation>Secunde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="562"/>
+        <location filename="../qt-ui/preferences.ui" line="587"/>
         <source>Show</source>
         <translation>Arată</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="693"/>
         <source>Show non-used cylinders in Equipment Tab</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>GFLow la adâncimea maximă</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="691"/>
+        <location filename="../qt-ui/preferences.ui" line="716"/>
         <source>Misc</source>
         <translation>Diverse</translation>
     </message>
@@ -2077,47 +2228,77 @@ Vă rugăm, înlăturați-le mai întâi.</translation>
         <translation>Preferințe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="697"/>
+        <location filename="../qt-ui/preferences.ui" line="722"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="739"/>
         <source>GFHigh</source>
         <translation>GFHigh</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="24"/>
+        <source>System proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="25"/>
+        <source>HTTP proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="26"/>
+        <source>SOCKS proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="245"/>
         <source>Restart required</source>
         <translation>Este necesară o repornire</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>Pentru a încărca corect o nouă limbă trebuie să restartați Subsurface.</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>Deschide Fișierul de Log Implicit</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>Fișiere XML Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="394"/>
+        <source>Warning</source>
+        <translation>Avertizare</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"/>
+    </message>
 </context>
 <context>
     <name>PrintDialog</name>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="46"/>
         <source>&amp;Preview</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="43"/>
         <source>P&amp;rint</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="59"/>
@@ -2218,7 +2399,7 @@ Vă rugăm, înlăturați-le mai întâi.</translation>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="219"/>
         <source>Sizing heights (% of layout)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="256"/>
@@ -2246,72 +2427,72 @@ Vă rugăm, înlăturați-le mai întâi.</translation>
 <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>necunoscut</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>Scufundarea  #%1 - %2</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>Adâncimea maximă: %1 %2</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>Durata: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1918"/>
+        <location filename="../qt-ui/models.cpp" line="1898"/>
         <source>Gas Used:</source>
         <translation>Gaz Folosit:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1920"/>
+        <location filename="../qt-ui/models.cpp" line="1900"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1922"/>
+        <location filename="../qt-ui/models.cpp" line="1902"/>
         <source>Max. CNS:</source>
         <translation>CNS Max. :</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1924"/>
+        <location filename="../qt-ui/models.cpp" line="1904"/>
         <source>Weights:</source>
         <translation>GreutățiȘ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1929"/>
+        <location filename="../qt-ui/models.cpp" line="1909"/>
         <source>Notes:</source>
         <translation>Notițe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1936"/>
+        <location filename="../qt-ui/models.cpp" line="1916"/>
         <source>Divemaster:</source>
         <translation>Maestru scufundare:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1938"/>
+        <location filename="../qt-ui/models.cpp" line="1918"/>
         <source>Buddy:</source>
         <translation>Companion:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1940"/>
+        <location filename="../qt-ui/models.cpp" line="1920"/>
         <source>Suit:</source>
         <translation>Costum:</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1944"/>
+        <location filename="../qt-ui/models.cpp" line="1924"/>
         <source>Rating:</source>
         <translation>Rating:</translation>
     </message>
@@ -2319,75 +2500,90 @@ Vă rugăm, înlăturați-le mai întâi.</translation>
 <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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/>
+        <source>Make first divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="906"/>
+        <source>Delete this divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="913"/>
         <source>Add Gas Change</source>
         <translation>Adaugă Schimbare Gaz</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>Adaugă Semn de Carte</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>Șterge Eveniment</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>Șterge evenimente similare</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>
+        <translation type="unfinished"/>
     </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>Arată toate evenimentele</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>Ascunde evenimente</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>Ascunde toate %1 evenimentele?</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>Înlătură evenimentul selectat?</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>%1 @ %2:%3</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>AER</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>Șterge acest Punct</translation>
     </message>
@@ -2397,22 +2593,22 @@ Vă rugăm, înlăturați-le mai întâi.</translation>
         <translation>Închide</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="34"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation>Medie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="37"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation>Minim</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="40"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation>Maxim</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>Mutați harta si faceți dublu click pentru a seta locația scufundării</translation>
     </message>
@@ -2426,9 +2622,23 @@ Vă rugăm, înlăturați-le mai întâi.</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="128"/>
         <source>New starting number</source>
         <translation>Nou număr de început</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="126"/>
+        <source>New number</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchBar</name>
+    <message>
+        <location filename="../qt-ui/searchbar.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ShiftImageTimesDialog</name>
@@ -2440,47 +2650,52 @@ Vă rugăm, înlăturați-le mai întâi.</translation>
     <message>
         <location filename="../qt-ui/shiftimagetimes.ui" line="34"/>
         <source>Shift times of image(s) by</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="102"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="95"/>
+        <source>h:mm</source>
+        <translation>o:mm</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="105"/>
         <source>earlier</source>
         <translation>mai devreme</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="109"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="112"/>
         <source>later</source>
         <translation>mai târziu</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2493,23 +2708,23 @@ Vă rugăm, înlăturați-le mai întâi.</translation>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="49"/>
         <source>Shift times of selected dives by</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="72"/>
         <source>Shifted time:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="79"/>
         <source>Current time:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="86"/>
         <location filename="../qt-ui/shifttimes.ui" line="93"/>
         <source>0:0</source>
-        <translation type="unfinished">0:0</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="126"/>
@@ -2552,48 +2767,48 @@ Vă rugăm, înlăturați-le mai întâi.</translation>
     <message>
         <location filename="../qt-ui/about.cpp" line="13"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014&lt;/span&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>Serviciu Web</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/>
         <source>Connecting...</source>
         <translation>Se conectează...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="421"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="419"/>
         <source>Download finished</source>
         <translation>S-a terminat descărcarea</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/>
         <source>Connection Error: </source>
         <translation>Eroare de conexiune</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>Identificator de utilizator invalid!</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>Nu se poate parsa răspunsul!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/>
         <source>Download Success!</source>
         <translation>Descărcarea s-a încheiat cu succes!</translation>
     </message>
@@ -2609,17 +2824,17 @@ Vă rugăm, înlăturați-le mai întâi.</translation>
 <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>Descriere</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2627,7 +2842,7 @@ Vă rugăm, înlăturați-le mai întâi.</translation>
 <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>Informații</translation>
     </message>
@@ -2635,68 +2850,206 @@ Vă rugăm, înlăturați-le mai întâi.</translation>
 <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="37"/>
-        <source>&lt;h3&gt;Subsurface was unable to check for updates.&lt;/h3&gt;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="36"/>
+        <source>Subsurface was unable to check for updates.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
-        <source>&lt;br/&gt;&lt;b&gt;The following error occurred:&lt;/b&gt;&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="41"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="43"/>
-        <source>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Please check your internet connection.&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>Manual Utilizator</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>Nu s-a putut găsi manualul pentru Subsurface</translation>
     </message>
 </context>
 <context>
+    <name>UserSurvey</name>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="47"/>
+        <source>Subsurface User Survey</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="79"/>
+        <source>Recreational DIver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="92"/>
+        <source>Tech Diver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="105"/>
+        <source>Interested in dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="118"/>
+        <source>I am downloading dives from supported dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="131"/>
+        <source>I am importing dives from other software / sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="144"/>
+        <source>I am manually entering dives</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="190"/>
+        <source>Please type suggestions (in English) in the following box</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="27"/>
+        <source>
+Operating System: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="30"/>
+        <source>
+CPU Architecture: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="35"/>
+        <source>
+OS CPU Architecture %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="39"/>
+        <source>
+Language: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="73"/>
+        <source>Should we ask you later?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="74"/>
+        <source>Don&apos;t ask me again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="75"/>
+        <source>Ask Later</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="76"/>
+        <source>Ask again?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <source>Submit User Survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <source>Subsurface was unable to submit the user survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="101"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="102"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="111"/>
+        <source>Survey successfully submitted.</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </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>Descriere</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="723"/>
+        <location filename="../qt-ui/models.cpp" line="721"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2731,7 +3084,7 @@ Vă rugăm, înlăturați-le mai întâi.</translation>
     <message>
         <location filename="../qt-ui/webservices.ui" line="85"/>
         <source>Save User ID locally?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="92"/>
@@ -2744,12 +3097,12 @@ Vă rugăm, înlăturați-le mai întâi.</translation>
         <translation>Uploadează</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="279"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="277"/>
         <source>Transfering data...</source>
         <translation>Se transferă datele...</translation>
     </message>
@@ -2757,37 +3110,37 @@ Vă rugăm, înlăturați-le mai întâi.</translation>
 <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>Tip</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="368"/>
+        <location filename="../qt-ui/models.cpp" line="373"/>
         <source>Weight</source>
         <translation>Greutate</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>Făcând click aici veți înlătura sistemul de greutăți.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="453"/>
+        <location filename="../qt-ui/models.cpp" line="458"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="454"/>
+        <location filename="../qt-ui/models.cpp" line="459"/>
         <source>lbs</source>
         <translation>livre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="478"/>
+        <location filename="../qt-ui/models.cpp" line="483"/>
         <source>ft</source>
         <translation>picioare</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="484"/>
         <source>m</source>
         <translation>m</translation>
     </message>
@@ -2795,79 +3148,79 @@ Vă rugăm, înlăturați-le mai întâi.</translation>
 <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>An
 &gt; Luna / Excursie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1643"/>
         <source>Duration 
  Total</source>
         <translation>Durată
 Totală</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>
 Average</source>
         <translation>
 Medie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>
 Shortest</source>
         <translation>
 Cel mai scurt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>
 Longest</source>
         <translation>
 Cel mai lung</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>Adâncime (%1)
 Medie</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>
 Minim</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>
 Maxim</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>SAC (%1)
 Mediu</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>Temp. (%1)
@@ -2877,99 +3230,92 @@ Medie</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="58"/>
+        <location filename="../dive.c" line="87"/>
         <source>pascal</source>
         <translation>Pascal</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>bar</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>livre pe inch pătrat</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="104"/>
-        <location filename="../qt-gui.cpp" line="292"/>
-        <source>l</source>
-        <translation>l</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>picioare cubice</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>m</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>picioare</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>livre</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>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1120"/>
+        <location filename="../dive.c" line="1237"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) sau (%s)</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>aer</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="170"/>
+        <location filename="../equipment.c" line="210"/>
         <source>integrated</source>
         <translation>integrat</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="171"/>
+        <location filename="../equipment.c" line="211"/>
         <source>belt</source>
         <translation>curea</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="172"/>
+        <location filename="../equipment.c" line="212"/>
         <source>ankle</source>
         <translation>gleznă</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="173"/>
+        <location filename="../equipment.c" line="213"/>
         <source>backplate weight</source>
         <translation>greutate placă spate</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="174"/>
+        <location filename="../equipment.c" line="214"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -2986,823 +3332,865 @@ Medie</translation>
         <translation>Numărul maxim de coloane suportate la importarea CSV-ului este %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>none</source>
         <translation>niciunul</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>deco stop</source>
         <translation>oprire de decompresie</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ascent</source>
         <translation>ascensiune</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ceiling</source>
         <translation>plafon</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>workload</source>
         <translation>volum de muncă</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>transmitter</source>
         <translation>transmițător</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>violation</source>
         <translation>încălcare</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>bookmark</source>
         <translation>semn de carte</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>surface</source>
         <translation>suprafață</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>safety stop</source>
         <translation>oprire pentru siguranță</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>schimbarea gazului</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (voluntary)</source>
         <translation>oprire pentru siguranță (voluntară)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (mandatory)</source>
         <translation>oprire pentru siguranță (obligatorie)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>deepstop</source>
         <translation>deepstop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>ceiling (safety stop)</source>
         <translation>plafon (oprire pentru siguranță)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>divetime</source>
         <translation>timp scufundare</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>maxdepth</source>
         <translation>adâncime maximă</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>airtime</source>
         <translation>timp aer rămas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>heading</source>
         <translation>direcție</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>tissue level warning</source>
         <translation>avertizare nivel țesut</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>non stop time</source>
         <translation>timp fără oprire</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="163"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>invalid event number</source>
         <translation>numărul evenimentul este invalid</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>Nu s-a putut crea parser pentru %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="411"/>
+        <location filename="../libdivecomputer.c" line="414"/>
         <source>Error registering the data</source>
         <translation>Eroare înregistrând datele</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="419"/>
+        <location filename="../libdivecomputer.c" line="422"/>
         <source>Error parsing the datetime</source>
         <translation>Eroare parsând data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="438"/>
         <source>Dive %d: %s %d %04d</source>
         <translation>Scufundarea %d: %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="440"/>
+        <location filename="../libdivecomputer.c" line="443"/>
         <source>Error parsing the divetime</source>
         <translation>Eroare parsând data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="449"/>
+        <location filename="../libdivecomputer.c" line="452"/>
         <source>Error parsing the maxdepth</source>
         <translation>Eroare parsând adâncimea maximă</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="458"/>
+        <location filename="../libdivecomputer.c" line="461"/>
         <source>Error parsing the gas mix count</source>
         <translation>Eroare parsând valoarea amestecului de gaz</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="470"/>
+        <location filename="../libdivecomputer.c" line="473"/>
         <source>Error obtaining water salinity</source>
         <translation>Eroare obținând salinitatea apei</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error obtaining surface pressure</source>
         <translation>Eroare obținând presiunea la suprafață</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the gas mix</source>
         <translation>Eroare parsând amestecul de gaz</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="493"/>
+        <location filename="../libdivecomputer.c" line="496"/>
         <source>Error parsing the samples</source>
         <translation>Eroare parsând eșantioanele</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="623"/>
+        <location filename="../libdivecomputer.c" line="626"/>
         <source>Event: waiting for user action</source>
         <translation>Eveniment: aștept acțiunea utilizatorului</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>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="691"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the event handler.</source>
         <translation>Eroare la înregistrarea handlerului de evenimente.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="696"/>
+        <location filename="../libdivecomputer.c" line="699"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Eroare la înregistrarea handlerului de anulare.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="717"/>
+        <location filename="../libdivecomputer.c" line="720"/>
         <source>Dive data import error</source>
         <translation>Eroare la importarea datelor despre scufundare</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="756"/>
+        <location filename="../libdivecomputer.c" line="759"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Nu s-a putut crea contextul libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="763"/>
+        <location filename="../libdivecomputer.c" line="766"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Nu s-a putut deschide %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="462"/>
+        <location filename="../parse-xml.c" line="466"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Valoare procentuală neobișnuită %s
 </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>Nu s-a putut parsa „%s”</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>Query-ul get_events nu a reușit.
 </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>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../file.c" line="166"/>
-        <source>Database connection failed &apos;%s&apos;.
+        <source>Database connection failed '%s'.
 </source>
         <translation>Conectarea la baza de date a eșuat „%s”.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1887"/>
-        <location filename="../parse-xml.c" line="2034"/>
-        <source>Database query failed &apos;%s&apos;.
+        <location filename="../parse-xml.c" line="1945"/>
+        <location filename="../parse-xml.c" line="2092"/>
+        <source>Database query failed '%s'.
 </source>
         <translation>Query-ul bazei de date a eșuat „%s”.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1998"/>
+        <location filename="../parse-xml.c" line="2056"/>
         <source>Database query get_cylinders failed.
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>Nu s-a putut deschide stylesheet-ul %s</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>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="146"/>
-        <location filename="../planner.c" line="617"/>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation>Nu s-a putut găsi gazul %d/%d</translation>
+        <location filename="../planner.c" line="159"/>
+        <location filename="../planner.c" line="752"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="308"/>
+        <location filename="../planner.c" line="345"/>
         <source>Too many gas mixes</source>
         <translation>Prea multe amestecuri de gaz</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="489"/>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation>%s
-Planul de scufundare Subsurface
-bazat pe GFlow = %.0f si GFhigh = %.0f
-
-</translation>
+        <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"/>
     </message>
     <message>
-        <location filename="../planner.c" line="530"/>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Tranziția la %.*f %s în %d:%02d min - timp rulare %d:%02u pe %s
-</translation>
+        <location filename="../planner.c" line="535"/>
+        <source>based on GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="539"/>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Stați la  %.*f %s pentru  %d:%02d min - timp rulare %d:%02u pe %s
-</translation>
+        <location filename="../planner.c" line="538"/>
+        <source>Subsurface dive plan</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="550"/>
-        <source>Switch gas to %s
-</source>
-        <translation>Schimbați gazul la %s
-</translation>
+        <location filename="../planner.c" line="542"/>
+        <source>depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="558"/>
-        <source>Gas consumption:
-</source>
-        <translation>Consum de gaz:
-</translation>
+        <location filename="../planner.c" line="545"/>
+        <source>runtime</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="569"/>
-        <source>%.0f%s of %s
-</source>
-        <translation>%.0f%s de %s
-</translation>
+        <location filename="../planner.c" line="548"/>
+        <source>duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="551"/>
+        <source>gas</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="606"/>
+        <source>%3.0f%s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
+        <source>%3dmin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="629"/>
+        <source>Switch gas to %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="638"/>
+        <source>Gas consumption:</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="659"/>
+        <source>this is more gas than available in the specified cylinder!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="664"/>
+        <source>not enough reserve for gas sharing on ascent!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="810"/>
+        <location filename="../planner.c" line="666"/>
+        <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="668"/>
+        <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="980"/>
         <source>ean</source>
         <translation>ean</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1229"/>
+        <location filename="../profile.c" line="1253"/>
         <source>P: %d%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1233"/>
+        <location filename="../profile.c" line="1257"/>
         <source>T: %.1f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1263"/>
         <source>V: %.1f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1244"/>
+        <location filename="../profile.c" line="1268"/>
         <source>CNS: %u%%
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1246"/>
+        <location filename="../profile.c" line="1270"/>
         <source>pO%s: %.2fbar
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1272"/>
         <source>pN%s: %.2fbar
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="1274"/>
         <source>pHe: %.2fbar
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="1277"/>
         <source>MOD: %d%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1276"/>
+        <location filename="../profile.c" line="1300"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="1308"/>
         <source>Deco: %umin @ %.0f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1291"/>
+        <location filename="../profile.c" line="1315"/>
         <source>In deco
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1293"/>
+        <location filename="../profile.c" line="1317"/>
         <source>NDL: %umin
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1305"/>
+        <location filename="../profile.c" line="1329"/>
         <source>In deco (calc)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1307"/>
+        <location filename="../profile.c" line="1331"/>
         <source>NDL: %umin (calc)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1310"/>
+        <location filename="../profile.c" line="1334"/>
         <source>TTS: %umin (calc)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1313"/>
+        <location filename="../profile.c" line="1337"/>
         <source>Calculated ceiling %.0f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1319"/>
+        <location filename="../profile.c" line="1343"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1325"/>
+        <location filename="../profile.c" line="1349"/>
         <source>heartbeat: %d
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1327"/>
+        <location filename="../profile.c" line="1351"/>
         <source>bearing: %d
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1419"/>
+        <location filename="../profile.c" line="1443"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</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>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1435"/>
+        <location filename="../profile.c" line="1459"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1439"/>
+        <location filename="../profile.c" line="1463"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</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>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1454"/>
+        <location filename="../profile.c" line="1478"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="273"/>
+        <location filename="../qt-gui.cpp" line="281"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="276"/>
+        <location filename="../qt-gui.cpp" line="284"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="392"/>
-        <source>%1, %2 %3, %4 %5:%6</source>
-        <translation>%1, %2 %3, %4 %5:%6</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="405"/>
-        <source>%1 %2, %3
-%4:%5</source>
-        <translation>%1 %2, %3
-%4:%5</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="418"/>
+        <location filename="../qt-gui.cpp" line="417"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 scufundări)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="423"/>
+        <location filename="../qt-gui.cpp" line="422"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 scufundare)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>boat</source>
         <translation>ambarcațiune</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>shore</source>
         <translation>țărm</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>drift</source>
         <translation>derivă</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>deep</source>
         <translation>adânc</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>cavern</source>
         <translation>cavernă</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>ice</source>
         <translation>gheață</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>wreck</source>
         <translation>epavă</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>cave</source>
         <translation>peșteră</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>altitude</source>
         <translation>altitudine</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>pool</source>
         <translation>piscină</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>lake</source>
         <translation>lac</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>river</source>
         <translation>râu</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>night</source>
         <translation>noapte</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>fresh</source>
         <translation>proaspăt</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>student</source>
         <translation>student</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>photo</source>
         <translation>fotografie</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>video</source>
         <translation>videoclip</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>instructor</source>
         <translation>instructor</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="25"/>
         <source>deco</source>
         <translation>decompresie</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="216"/>
+        <location filename="../dive.c" line="133"/>
+        <source>ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="214"/>
         <source>more than %d days</source>
         <translation>mai mult de %d zile</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="220"/>
         <source>%dd %dh %dmin</source>
         <translation>%dz %do %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="224"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dh %dmin</source>
         <translation>%do %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="235"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation>pentru scufundările nr.</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="242"/>
+        <location filename="../statistics.c" line="240"/>
         <source>for selected dives</source>
         <translation>pentru scufundările selectate</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="275"/>
         <source>for dive #%d</source>
         <translation>pentru scufundarea nr. %d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for selected dive</source>
         <translation>pentru scufundarea selectată</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for all dives</source>
         <translation>pentru toate scufundările</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="283"/>
+        <location filename="../statistics.c" line="281"/>
         <source>(no dives)</source>
         <translation>(nicio scufundare)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sun</source>
         <translation>Duminică</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Mon</source>
         <translation>Luni</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Tue</source>
         <translation>Marți</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Wed</source>
         <translation>Miercuri</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Thu</source>
         <translation>Joi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Fri</source>
         <translation>Vineri</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sat</source>
         <translation>Sâmbătă</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jun</source>
         <translation>Iun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Jul</source>
         <translation>Iul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Oct</source>
         <translation>Oct</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Nov</source>
         <translation>Noi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Dec</source>
         <translation>Dec</translation>
     </message>
@@ -3832,97 +4220,97 @@ Is the Uemis Zurich plugged in correctly?</source>
 Este Uemis Zurich conectat corect?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="107"/>
+        <location filename="../uemis-downloader.c" line="111"/>
         <source>unknown</source>
         <translation>necunoscut</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="379"/>
+        <location filename="../uemis-downloader.c" line="383"/>
         <source>Reading %s %s</source>
         <translation>Citind %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="399"/>
+        <location filename="../uemis-downloader.c" line="403"/>
         <source>data</source>
         <translation>data</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="420"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>divelog entry id</source>
         <translation>id-ul înregistrării în divelog</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="422"/>
+        <location filename="../uemis-downloader.c" line="426"/>
         <source>divespot data id</source>
         <translation>id-ul înregistrării în divespot</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>wetsuit</source>
         <translation>wetsuit</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>semidry</source>
         <translation>semidry</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>drysuit</source>
         <translation>drysuit</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>shorty</source>
         <translation>shorty</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>vest</source>
         <translation>vest</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>long john</source>
         <translation>long john</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>jacket</source>
         <translation>jacket</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>full suit</source>
         <translation>full suit</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>2 pcs full suit</source>
         <translation>full suit 2 părți</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="620"/>
+        <location filename="../uemis-downloader.c" line="624"/>
         <source>membrane</source>
         <translation>membrană</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="802"/>
+        <location filename="../uemis-downloader.c" line="823"/>
         <source>Init Communication</source>
         <translation>Inițializează Comunicarea</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="804"/>
+        <location filename="../uemis-downloader.c" line="825"/>
         <source>Uemis init failed</source>
         <translation>Inițializarea Uemis a eșuat</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="815"/>
+        <location filename="../uemis-downloader.c" line="836"/>
         <source>Start download</source>
         <translation>Începe descărcarea</translation>
     </message>
@@ -3943,18 +4331,18 @@ Este Uemis Zurich conectat corect?</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="203"/>
-        <source>PO2 Green Warning</source>
-        <translation>Avertizare Verde PO2</translation>
+        <source>pO₂ Green Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
-        <source>PO2 Ascend Warning</source>
-        <translation>Avertizare de Ascensiune PO2</translation>
+        <source>pO₂ Ascend Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="208"/>
-        <source>PO2 Ascend Alarm</source>
-        <translation>Alarmă de Ascensiune PO2</translation>
+        <source>pO₂ Ascend Alarm</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
@@ -3984,7 +4372,7 @@ Este Uemis Zurich conectat corect?</translation>
     <message>
         <location filename="../uemis.c" line="222"/>
         <source>Max Deco Time Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="224"/>
@@ -3994,7 +4382,7 @@ Este Uemis Zurich conectat corect?</translation>
     <message>
         <location filename="../uemis.c" line="226"/>
         <source>Dive Time Alert</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="228"/>
@@ -4016,5 +4404,214 @@ Este Uemis Zurich conectat corect?</translation>
         <source>Low Battery Alert</source>
         <translation>Alertă de Baterie Scăzută</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"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="36"/>
+        <source>Date:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="38"/>
+        <source>Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="40"/>
+        <source>Duration:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="41"/>
+        <source>min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="43"/>
+        <source>Max Depth:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="46"/>
+        <source>Air Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="48"/>
+        <source>Water Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="50"/>
+        <source>Location:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="54"/>
+        <source>Notes:</source>
+        <translation>Notițe</translation>
+    </message>
+</context>
+<context>
+    <name>plannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="35"/>
+        <source>Rates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="56"/>
+        <source>Ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="77"/>
+        <source>below 75% avg. depth</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="94"/>
+        <source>75%-50% avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="111"/>
+        <source>50% avg. depth - 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="128"/>
+        <source>6m/20ft to surface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="148"/>
+        <source>Descent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="200"/>
+        <source>surface to the bottom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="226"/>
+        <source>Planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="247"/>
+        <source>GF low</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="264"/>
+        <source>GF high</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
+        <source>Drop to first depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
+        <source>Last Stop at 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>plan backgas breaks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="318"/>
+        <source>Gas Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <source>bottom SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="349"/>
+        <source>deco SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="359"/>
+        <source>bottom pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="389"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="382"/>
+        <source>deco pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="421"/>
+        <source>Dive Notes</source>
+        <translation>Notițele Scufundării</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="445"/>
+        <source>display runtime</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="458"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="461"/>
+        <source>display segment duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="471"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="474"/>
+        <source>display transitions in deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="481"/>
+        <source>verbatim diveplan</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts
index 82fe8c0f9..835498d71 100644
--- a/translations/subsurface_ru_RU.ts
+++ b/translations/subsurface_ru_RU.ts
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="ru_RU" version="2.0">
+<defaultcodec>UTF-8</defaultcodec>
 <context>
     <name>CylindersModel</name>
     <message>
@@ -37,42 +38,42 @@
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="71"/>
+        <location filename="../qt-ui/models.cpp" line="70"/>
         <source>Switch at</source>
         <translation>Переключить на</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>Удалить этот баллон.</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>Баллон не может быть удален</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>Нельзя удалять баллоны, которые используются в погружении.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="507"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="508"/>
         <source>bar</source>
         <translation>Бар</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="527"/>
+        <location filename="../qt-ui/models.cpp" line="532"/>
         <source>l</source>
         <translation>л</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="528"/>
+        <location filename="../qt-ui/models.cpp" line="533"/>
         <source>cuft</source>
         <translation>куб. фут</translation>
     </message>
@@ -100,22 +101,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>Модель</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Device ID</source>
         <translation>Идентификатор</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Nickname</source>
         <translation>Имя устройства</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>Удалить этот дайв-компьютер.</translation>
     </message>
@@ -123,190 +124,326 @@
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="90"/>
-        <source>air</source>
-        <translation>воздух</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="92"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</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>Переход на Откр. Цикл</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> начало</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> конец</translation>
     </message>
 </context>
 <context>
-    <name>DiveGasPressureItem</name>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="475"/>
-        <source>air</source>
-        <translation>воздух</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="476"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-</context>
-<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1258"/>
-        <source> l/min</source>
-        <translation>л/мин</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
-        <source> cuft/min</source>
-        <translation>куб.фут/мин</translation>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <source>/min</source>
+        <translation>/мин</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>Показать поле поиска</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="706"/>
         <source>expand all</source>
         <translation>развернуть все</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="740"/>
+        <location filename="../qt-ui/divelistview.cpp" line="707"/>
         <source>collapse all</source>
         <translation>свернуть все</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="741"/>
+        <location filename="../qt-ui/divelistview.cpp" line="708"/>
         <source>collapse others</source>
         <translation>свернуть остальные</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>удалить погружение(-я) из поездки</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>создать новую поездку выше</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>добавить к поездке выше</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>назамедлительно добавить погружение(-я) к поездке внизу</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>объединить с поездкой выше</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>объединить с поездкой ниже</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>удалить погружение(-я)</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>пометить как некорректные</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
-        <source>save As</source>
-        <translation>сохранить как</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="763"/>
-        <source>export As UDDF</source>
-        <translation>экспорт UDDF</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="764"/>
-        <source>export As CSV</source>
-        <translation>Экспортировать как CSV</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="744"/>
+        <source>renumber dive(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="765"/>
+        <location filename="../qt-ui/divelistview.cpp" line="745"/>
         <source>shift times</source>
         <translation>сдвинуть время</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="766"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>load images</source>
         <translation>загрузить изображения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="769"/>
-        <source>upload dive(s) to divelogs.de</source>
-        <translation>выгрузить на divelogs.de</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Open Image Files</source>
+        <translation>Открыть изображения</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation>Изображения (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <source>merge selected dives</source>
+        <translation>объединить выбранные </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="24"/>
+        <source>General Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="30"/>
+        <source>Export format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="42"/>
+        <source>Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="61"/>
+        <source>UDDF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="74"/>
+        <source>divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="84"/>
+        <source>CSV</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="94"/>
+        <source>Worldmap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="107"/>
+        <source>Selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="116"/>
+        <source>Selected dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="126"/>
+        <source>All dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="178"/>
+        <source>HTML</source>
+        <translation>HTML</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="184"/>
+        <source>General Settings</source>
+        <translation>Общие настройки</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="190"/>
+        <source>Subsurface Numbers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="203"/>
+        <source>Selected Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="216"/>
+        <source>Minimum Javascript</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="229"/>
+        <source>All Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="239"/>
+        <source>Export List only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="252"/>
+        <source>Style Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="264"/>
+        <source>Font</source>
+        <translation>Шрифт</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="274"/>
+        <source>Font size</source>
+        <translation>Размер шрифта</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
+        <source>8</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <source>10</source>
+        <translation>10</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <source>12</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <source>14</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <source>16</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <source>18</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="795"/>
-        <source>Save Dives As...</source>
-        <translation>Сохранить погружения как...</translation>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <source>20</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="814"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="323"/>
+        <source>Theme</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <source>Sand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="153"/>
         <source>Export UDDF File as</source>
         <translation>Экспортировать UDDF файл как</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>UDDF файлы (*.uddf *.UDDF)</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>Экспортировать CSV файл как</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>CSV файлы (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Open Image Files</source>
-        <translation>Открыть изображения</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="162"/>
+        <source>Export World Map</source>
+        <translation>Экспортировать карту мира</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
-        <translation>Изображения (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="163"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="177"/>
+        <source>HTML files (*.html)</source>
+        <translation>HTML файлы (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="760"/>
-        <source>merge selected dives</source>
-        <translation>объединить выбранные </translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="167"/>
+        <source>Export Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="168"/>
+        <source>XML files (*.xml *.ssrf)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="176"/>
+        <source>Export HTML files as</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -317,138 +454,133 @@
         <translation>Импорт журнала погружений</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="36"/>
-        <source>Import CSV Dive Log Files</source>
-        <translation>Импорт CSV журналов</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="50"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
         <source>CSV options</source>
         <translation>Параметры CSV</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>Разделитель</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>Шаблоны</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>Положение полей</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="80"/>
         <source>Depth</source>
         <translation>Глубина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="100"/>
         <source>Stopdepth</source>
         <translation>Остановка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="107"/>
         <source>PO2</source>
         <translation>PO2</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>Время</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="121"/>
         <source>Temp</source>
         <translation>Темп.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="151"/>
         <source>Cns</source>
         <translation>CNS</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>Единицы</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>Метрическая</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>Имперская</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="248"/>
         <source>Manual dives</source>
         <translation>Погружения введённые вручную</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="283"/>
         <source>Dive #</source>
         <translation>№</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="317"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="385"/>
         <source>Duration</source>
         <translation>Длительность</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="470"/>
         <source>Tags</source>
         <translation>Метки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
         <source>Location</source>
         <translation>Местонахождение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="453"/>
         <source>Gps</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="300"/>
         <source>Max depth</source>
         <translation>Макс. глубина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="334"/>
         <source>Mean depth</source>
         <translation>Сред. глубина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="368"/>
         <source>Buddy</source>
         <translation>Партнер</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="402"/>
         <source>Notes</source>
         <translation>Примечания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="436"/>
         <source>Weight</source>
         <translation>Вес</translation>
     </message>
@@ -456,105 +588,70 @@
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="71"/>
-        <source>Bottom SAC</source>
-        <translation>SAC на дне</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="85"/>
-        <source>SAC on DECO Stop</source>
-        <translation>SAC на деко</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="78"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="98"/>
-        <source>GFLow</source>
-        <translation>GFLow</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="125"/>
-        <source>Last Stop at 6m</source>
-        <translation>Последняя остановка на 6м</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="106"/>
+        <source>Planned Dive Time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="174"/>
-        <source>Start Time</source>
-        <translation>Начало</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="134"/>
+        <source>Altitude</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="181"/>
+        <location filename="../qt-ui/diveplanner.ui" line="141"/>
         <source>ATM Pressure</source>
         <translation>Атмосферное давление</translation>
     </message>
-</context>
-<context>
-    <name>DivePlannerGraphics</name>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="114"/>
-        <source>10m</source>
-        <translation>10м</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="116"/>
-        <source>30ft</source>
-        <translation>30фут</translation>
-    </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="363"/>
-        <source>Handler Position Error</source>
-        <translation>Ошибка позиции обработчика</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="148"/>
+        <source>mbar</source>
+        <translation type="unfinished"/>
     </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>
-        <translation>Одна или несколько остановок будут утеряны во время этой
-операции. Удалите их.</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="158"/>
+        <source>m</source>
+        <translation>м</translation>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="445"/>
-        <source>AIR</source>
-        <translation>воздух</translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="137"/>
+        <source>unknown</source>
+        <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1148"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="586"/>
         <source>Final Depth</source>
         <translation>Конечная глубина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1150"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="588"/>
         <source>Run time</source>
         <translation>Время исполнения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1152"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="590"/>
         <source>Duration</source>
         <translation>Длительность</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1154"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="592"/>
         <source>Used Gas</source>
         <translation>Используемый газ</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>Настройка CC</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>Отменить план?</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>Вы собираетесь отказаться от плана.</translation>
     </message>
@@ -562,17 +659,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>Точки погружения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="256"/>
         <source>Available Gases</source>
         <translation>Доступные газы</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>Добавить точку погружения</translation>
     </message>
@@ -616,8 +713,23 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
-        <source>Pressure  S</source>
-        <translation>Давление S</translation>
+        <source>Pressure S</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <source>pN₂</source>
+        <translation>pN₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>pHe</source>
+        <translation>pHe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
@@ -634,86 +746,71 @@ Please, remove them first.</source>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
-        <source>PN2</source>
-        <translation>pN₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
-        <source>PHE</source>
-        <translation>pHe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
-        <source>PO2</source>
-        <translation>PO2</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>№</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>date</source>
         <translation>дата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>m</source>
         <translation>м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>ft</source>
         <translation>фут</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1298"/>
         <source>min</source>
         <translation>мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>lbs</source>
         <translation>фунт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
+        <location filename="../qt-ui/models.cpp" line="1307"/>
         <source>suit</source>
         <translation>костюм</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1310"/>
         <source>cyl</source>
         <translation>баллон</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1344"/>
+        <location filename="../qt-ui/models.cpp" line="1325"/>
         <source>location</source>
         <translation>местоположение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1316"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1338"/>
+        <location filename="../qt-ui/models.cpp" line="1319"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1341"/>
+        <location filename="../qt-ui/models.cpp" line="1322"/>
         <source>maxCNS</source>
         <translation>макс.CNS</translation>
     </message>
@@ -721,115 +818,115 @@ 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>Неверный ответ сервера</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>XML тег &apos;DiveDateReader&apos; не найден, получен &apos;%1</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>XML тег &apos;DiveDates&apos; не найден</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>Неверный XML ответ. Строка %1: %2</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>не выбраны погружения</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>не удалось создать ZIP файл для загрузки: %s</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>невозможно создать временный файл: %s</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>внутренняя ошибка: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="181"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="179"/>
         <source>internal error</source>
         <translation>внутренняя ошибка</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>Готово</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>Выгрузка списка погружений...</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>Загрузка списка погружений...</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>Загрузка %1 погружений...</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>Загрузка завершена - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
         <source>Corrupted download</source>
         <translation>Поврежденная загрузка</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>Невозможно открыть архив:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Upload failed</source>
         <translation>Выгрузка не удалась</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="849"/>
         <source>Upload successful</source>
         <translation>Выгрузка завершена</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="854"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="852"/>
         <source>Login failed</source>
         <translation>Ошибка входа</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>Ошибка разбора ответа</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="868"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Error: %1</source>
         <translation>Ошибка: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="835"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/>
         <source>Upload finished</source>
         <translation>Выгрузка завершена</translation>
     </message>
@@ -837,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>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="165"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/>
         <source>Error</source>
         <translation>Ошибка</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>Повторить</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>Найти дайвкомпьютер Uemis</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>Выберите файл для журнала загрузки из дайв-компьютера</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>Файлы журналов (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="339"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
         <source>Warning</source>
         <translation>Предупреждение</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>При сохранении дампа, погружения в журнал НЕ загружаются.</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>Выберите файл для двоичного дампа из дайв-компьютера</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>Дамп-файлы (*.bin)</translation>
     </message>
@@ -952,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>Изменить место погружений</translation>
     </message>
@@ -961,848 +1058,854 @@ 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>Погружение</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>Местонахождение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="148"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Coordinates</source>
         <translation>Координаты</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="169"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
         <source>Divemaster</source>
         <translation>Инструктор</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="155"/>
+        <location filename="../qt-ui/maintab.ui" line="148"/>
         <source>Buddy</source>
         <translation>Партнер</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="63"/>
-        <source>Start time</source>
-        <translation>Начало</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>Темп. воздуха</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>Темп. воды</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="127"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Tags</source>
         <translation>Метки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="223"/>
         <source>Rating</source>
         <translation>Оценка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="236"/>
         <source>Visibility</source>
         <translation>Видимость</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="215"/>
+        <location filename="../qt-ui/maintab.ui" line="127"/>
         <source>Suit</source>
         <translation>Костюм</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>Примечания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="270"/>
+        <location filename="../qt-ui/maintab.ui" line="311"/>
         <source>Equipment</source>
         <translation>Снаряжение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="350"/>
+        <location filename="../qt-ui/maintab.ui" line="391"/>
         <source>Dive Info</source>
         <translation>Информация</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>Дата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="414"/>
+        <location filename="../qt-ui/maintab.ui" line="275"/>
+        <source>Time</source>
+        <translation>Время</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="455"/>
         <source>Interval</source>
         <translation>Интервал</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="433"/>
+        <location filename="../qt-ui/maintab.ui" line="474"/>
         <source>Gases Used</source>
         <translation>Исп. газы</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="452"/>
+        <location filename="../qt-ui/maintab.ui" line="493"/>
         <source>Gas Consumed</source>
         <translation>Расход газа</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>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="531"/>
         <source>Max. Depth</source>
         <translation>Макс. глубина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="509"/>
+        <location filename="../qt-ui/maintab.ui" line="550"/>
         <source>Ave. Depth</source>
         <translation>Ср. глубина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="528"/>
+        <location filename="../qt-ui/maintab.ui" line="569"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="547"/>
+        <location filename="../qt-ui/maintab.ui" line="588"/>
         <source>Air Pressure</source>
         <translation>Давление воздуха</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="566"/>
+        <location filename="../qt-ui/maintab.ui" line="607"/>
         <source>Air Temperature</source>
         <translation>Температура воздуха</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="585"/>
+        <location filename="../qt-ui/maintab.ui" line="626"/>
         <source>Water Temperature</source>
         <translation>Температура воды</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="604"/>
+        <location filename="../qt-ui/maintab.ui" line="645"/>
         <source>Dive Time</source>
         <translation>Время погр.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="623"/>
+        <location filename="../qt-ui/maintab.ui" line="664"/>
         <source>Salinity</source>
         <translation>Соленость</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="660"/>
+        <location filename="../qt-ui/maintab.ui" line="701"/>
         <source>Stats</source>
         <translation>Статистика</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="746"/>
         <source>Depth</source>
         <translation>Глуб.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Temperature</source>
         <translation>Температура</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="784"/>
         <source>Duration</source>
         <translation>Длительность</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Total Time</source>
         <translation>Общее время</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="835"/>
         <source>Dives</source>
         <translation>Погружения</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="919"/>
+        <source>Photos</source>
+        <translation>Фотографии</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="89"/>
         <source>Cylinders</source>
         <translation>Баллоны</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="90"/>
         <source>Add Cylinder</source>
         <translation>Добавить баллон</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="93"/>
         <source>Weights</source>
         <translation>Грузы</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>Добавить груз</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="438"/>
+        <location filename="../qt-ui/maintab.cpp" line="409"/>
         <source>Trip Location</source>
         <translation>Местонахождение поездки</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>Заметки к поездке</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="42"/>
+        <location filename="../qt-ui/maintab.cpp" line="48"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="46"/>
+        <location filename="../qt-ui/maintab.cpp" line="52"/>
         <source>Cancel</source>
         <translation>Отмена</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>Темп. возд. [%1]</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>Темп. воды [%1]</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>Редактирование поездки.</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>Множественное редактирование.</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>Редактирование погружения.</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>/мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="494"/>
+        <location filename="../qt-ui/maintab.cpp" line="464"/>
         <source>unknown</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>N</source>
-        <translation>С</translation>
+        <location filename="../qt-ui/maintab.cpp" line="501"/>
+        <source>Deepest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>S</source>
-        <translation>Ю</translation>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <source>Shallowest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>E</source>
-        <translation>В</translation>
+        <location filename="../qt-ui/maintab.cpp" line="794"/>
+        <source>Discard the Changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>W</source>
-        <translation>З</translation>
+        <location filename="../qt-ui/maintab.cpp" line="795"/>
+        <source>You are about to discard your changes.</source>
+        <translation type="unfinished"/>
     </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>Фильтр</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="571"/>
+        <location filename="../qt-ui/mainwindow.ui" line="646"/>
         <source>&amp;File</source>
         <translation>Файл</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="583"/>
+        <source>Print</source>
+        <translation>Печать</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:'Courier'; 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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
         <source>&amp;Log</source>
         <translation>Журнал</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="606"/>
+        <location filename="../qt-ui/mainwindow.ui" line="679"/>
         <source>&amp;View</source>
         <translation>Вид</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="628"/>
+        <location filename="../qt-ui/mainwindow.ui" line="701"/>
         <source>&amp;Help</source>
         <translation>Помощь</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="636"/>
+        <location filename="../qt-ui/mainwindow.ui" line="709"/>
         <source>&amp;Import</source>
         <translation>Импорт</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>Новый журнал</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="655"/>
+        <location filename="../qt-ui/mainwindow.ui" line="728"/>
         <source>New</source>
         <translation>Новый</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="658"/>
+        <location filename="../qt-ui/mainwindow.ui" line="731"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</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>Открыть журнал</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="666"/>
+        <location filename="../qt-ui/mainwindow.ui" line="739"/>
         <source>Open</source>
         <translation>Открыть</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <location filename="../qt-ui/mainwindow.ui" line="742"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="674"/>
+        <location filename="../qt-ui/mainwindow.ui" line="747"/>
         <source>&amp;Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="677"/>
+        <location filename="../qt-ui/mainwindow.ui" line="750"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="680"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>Save as</source>
         <translation>Сохранить как</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>Ctrl+Shift+S</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>Закрыть</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="702"/>
+        <location filename="../qt-ui/mainwindow.ui" line="775"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="902"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <source>P&amp;references</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="831"/>
+        <source>&amp;Add Dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <source>Auto &amp;Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="863"/>
+        <source>&amp;Dive List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="871"/>
+        <source>&amp;Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="879"/>
+        <source>&amp;Info</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="887"/>
+        <source>&amp;All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="895"/>
+        <source>P&amp;rev DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="903"/>
+        <source>&amp;Next DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="911"/>
+        <source>&amp;Select Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <source>&amp;About Subsurface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="937"/>
+        <source>&amp;Globe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="953"/>
+        <source>&amp;Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="959"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="707"/>
-        <source>Export &amp;UDDF</source>
-        <translation>Экспорт UDDF</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="1008"/>
+        <source>&amp;Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1011"/>
+        <source>Export Dive Logs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1014"/>
+        <source>Ctrl+E</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Enable the pN2 Graph</source>
         <translation>Показать график pN2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <location filename="../qt-ui/mainwindow.ui" line="128"/>
         <source>Enable the pHe graph</source>
         <translation>Показать график pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <location filename="../qt-ui/mainwindow.ui" line="290"/>
         <source>Show/hide heart rate</source>
         <translation>Показать/скрыть пульс</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <location filename="../qt-ui/mainwindow.ui" line="342"/>
         <source>Enable EAD, END, and EADD</source>
         <translation>Показать EAD, END, EADD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="238"/>
         <source>Show NDL / TTS</source>
         <translation>Показать NDL / TTS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="456"/>
+        <location filename="../qt-ui/mainwindow.ui" line="394"/>
         <source>Rescale depth axis</source>
         <translation>Альтернативный масштаб</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="710"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="715"/>
-        <source>Export HTML World Map</source>
-        <translation>Экспортировать HTML карту мира</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="718"/>
-        <source>Ctrl+H</source>
-        <translation>Ctrl+H</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="723"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>&amp;Print</source>
         <translation>Печать</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="734"/>
+        <location filename="../qt-ui/mainwindow.ui" line="791"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="742"/>
+        <location filename="../qt-ui/mainwindow.ui" line="799"/>
         <source>&amp;Quit</source>
         <translation>Выход</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="753"/>
+        <location filename="../qt-ui/mainwindow.ui" line="810"/>
         <source>Import from &amp;dive computer</source>
         <translation>Импорт из дайвкомпьютера</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="818"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation>Импорт данных GPS из сервиса Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="764"/>
+        <location filename="../qt-ui/mainwindow.ui" line="821"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="826"/>
         <source>&amp;Edit Device Names</source>
         <translation>Список дайвкомпьютеров</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="834"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="782"/>
+        <location filename="../qt-ui/mainwindow.ui" line="839"/>
         <source>&amp;Renumber</source>
         <translation>Перенумеровать</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="785"/>
+        <location filename="../qt-ui/mainwindow.ui" line="842"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="798"/>
+        <location filename="../qt-ui/mainwindow.ui" line="855"/>
         <source>&amp;Yearly Statistics</source>
         <translation>Статистика за год</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="801"/>
+        <location filename="../qt-ui/mainwindow.ui" line="858"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="806"/>
-        <source>Dive List</source>
-        <translation>Список погружений</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="814"/>
-        <source>Profile</source>
-        <translation>Профиль</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="822"/>
-        <source>Info</source>
-        <translation>Информация</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="830"/>
-        <source>All</source>
-        <translation>Все</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="872"/>
+        <location filename="../qt-ui/mainwindow.ui" line="929"/>
         <source>User &amp;Manual</source>
         <translation>Руководство</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="880"/>
-        <source>Globe</source>
-        <translation>Карта</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="888"/>
+        <location filename="../qt-ui/mainwindow.ui" line="945"/>
         <source>P&amp;lan Dive</source>
         <translation>Планировщик</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="891"/>
+        <location filename="../qt-ui/mainwindow.ui" line="948"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="907"/>
-        <source>Import from Divelogs.de</source>
-        <translation>Импорт с сайта Divelogs.de</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1003"/>
         <source>&amp;Check for Updates</source>
         <translation>Проверить обновления</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="951"/>
-        <source>Export CSV</source>
-        <translation>Экспортировать CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="726"/>
+        <location filename="../qt-ui/mainwindow.ui" line="783"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</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>Показать график pO2</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>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="316"/>
         <source>Enable MOD</source>
         <translation>Показать MOD</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>Показать потолок компьютера</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>Показать расчетный потолок</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>Расчетный потолок с интервалом 3м</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>Расчет всех тканей</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>Показать SAC</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>Показать рулетку</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="731"/>
-        <source>Preferences</source>
-        <translation>Предпочтения</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="745"/>
+        <location filename="../qt-ui/mainwindow.ui" line="802"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="756"/>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="774"/>
-        <source>Add Dive</source>
-        <translation>Добавить погружение</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="793"/>
-        <source>Auto Group</source>
-        <translation>Авто-группировка</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="809"/>
+        <location filename="../qt-ui/mainwindow.ui" line="866"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="817"/>
+        <location filename="../qt-ui/mainwindow.ui" line="874"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <location filename="../qt-ui/mainwindow.ui" line="882"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="833"/>
+        <location filename="../qt-ui/mainwindow.ui" line="890"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="838"/>
-        <source>Prev DC</source>
-        <translation>Пред. компьютер</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="841"/>
+        <location filename="../qt-ui/mainwindow.ui" line="898"/>
         <source>Left</source>
         <translation>Влево</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="846"/>
-        <source>Next DC</source>
-        <translation>След. компьютер</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="849"/>
+        <location filename="../qt-ui/mainwindow.ui" line="906"/>
         <source>Right</source>
         <translation>Вправо</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="854"/>
-        <source>Select Events</source>
-        <translation>Выбрать события</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <location filename="../qt-ui/mainwindow.ui" line="916"/>
         <source>Input Plan</source>
         <translation>Ввести план</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="864"/>
-        <source>About Subsurface</source>
-        <translation>О Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="875"/>
+        <location filename="../qt-ui/mainwindow.ui" line="932"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="883"/>
+        <location filename="../qt-ui/mainwindow.ui" line="940"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="896"/>
-        <source>Import Log Files</source>
-        <translation>Импорт файлов журналов</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="899"/>
+        <location filename="../qt-ui/mainwindow.ui" line="956"/>
         <source>Import divelog files from other applications</source>
         <translation>Импортировать журнал погружений из другой программы</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="915"/>
+        <location filename="../qt-ui/mainwindow.ui" line="964"/>
+        <source>Import &amp;from Divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="972"/>
         <source>&amp;Full Screen</source>
         <translation>Полноэкранный режим</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>Переключить полноэкранный режим</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <location filename="../qt-ui/mainwindow.ui" line="978"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="174"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
         <source>Open File</source>
         <translation>Открыть файл</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>Сохраните или отмените изменения перед закрытием файла.</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>
-        <translation>Сохраните или отмените изменения перед открытием планировщика.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="396"/>
+        <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>Сохраните или отмените изменения перед добавлением погружения.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="645"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="419"/>
+        <source>Print runtime table</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="710"/>
         <source>Do you want to save the changes you made in the file %1?</source>
         <translation>Сохранить изменения в файле %1?</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>Сохранить изменения в файле журнала?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="652"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="717"/>
         <source>Save Changes?</source>
         <translation>Сохранить изменения?</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>Изменения будут утеряны, если вы не сохраните их.</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>Сохранить как</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>Предупреждение</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>Сохраните или отмените изменения перед открытием нового файла.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="280"/>
-        <source>Export UDDF File as</source>
-        <translation>Экспортировать UDDF файл как</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="281"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>UDDF файлы (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="289"/>
-        <source>Export CSV File as</source>
-        <translation>Экспортировать CSV файл как</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="290"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>CSV файлы (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="299"/>
-        <source>Export World Map</source>
-        <translation>Экспортировать карту мира</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="300"/>
-        <source>HTML files (*.html)</source>
-        <translation>HTML файлы (*.html)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="449"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="514"/>
         <source>Yearly Statistics</source>
         <translation>Статистика за год</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="961"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1076"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1199"/>
         <source>Open Dive Log File</source>
         <translation>Открыть журнал погружений</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <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>Файлы журналов (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);; Файлы XML(*.xml);; Файлы UDDF/UDCF(*.uddf *.udcf);; Файлы JDiveLog(*.jlb);; Файлы Suunto(*.sde *.db);;Файлы CSV(*.csv);; Все файлы(*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1225"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Пожалуйста, для начала закончите текущее редактирование, а потом пробуйте редактировать другой.</translation>
     </message>
 </context>
 <context>
+    <name>PlannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Last stop at 20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="416"/>
+        <source>Last stop at 6m</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>PreferencesDialog</name>
     <message>
         <location filename="../qt-ui/preferences.ui" line="85"/>
@@ -1825,247 +1928,297 @@ Please, remove them first.</source>
         <translation>Язык</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="151"/>
         <source>Lists and Tables</source>
         <translation>Списки и таблицы</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font</source>
         <translation>Шрифт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="167"/>
         <source>Font size</source>
         <translation>Размер шрифта</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="170"/>
+        <location filename="../qt-ui/preferences.ui" line="180"/>
         <source>Dives</source>
         <translation>Погружения</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>Журнал по умолчанию</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="188"/>
+        <location filename="../qt-ui/preferences.ui" line="198"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="197"/>
+        <location filename="../qt-ui/preferences.ui" line="207"/>
         <source>Display Invalid</source>
         <translation>Показывать ошибочные</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="214"/>
+        <location filename="../qt-ui/preferences.ui" line="224"/>
         <source>Default Cylinder</source>
         <translation>Баллон по умолчанию</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>Использовать</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <location filename="../qt-ui/preferences.ui" line="247"/>
         <source>Animations</source>
         <translation>Анимация</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <location filename="../qt-ui/preferences.ui" line="253"/>
         <source>Speed</source>
         <translation>Скорость</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="270"/>
+        <location filename="../qt-ui/preferences.ui" line="280"/>
         <source>Subsurface Webservice</source>
         <translation>Веб-сервис Subsurface</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>ID пользователя по умолчанию</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>Сохранить ID пользователя локально?</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="312"/>
+        <source>Reset all settings to their default value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
         <source>System</source>
         <translation>Система мер</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="348"/>
         <source>Metric</source>
         <translation>Метрическая</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="333"/>
+        <location filename="../qt-ui/preferences.ui" line="358"/>
         <source>Imperial</source>
         <translation>Имперская</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="343"/>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
         <source>Personalize</source>
         <translation>Настроить</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="392"/>
         <source>Depth</source>
         <translation>Глубина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="374"/>
+        <location filename="../qt-ui/preferences.ui" line="399"/>
         <source>meter</source>
         <translation>метр</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="409"/>
         <source>feet</source>
         <translation>фут</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="401"/>
+        <location filename="../qt-ui/preferences.ui" line="426"/>
         <source>bar</source>
         <translation>Бар</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="411"/>
+        <location filename="../qt-ui/preferences.ui" line="436"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="428"/>
+        <location filename="../qt-ui/preferences.ui" line="453"/>
         <source>liter</source>
         <translation>литр</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="438"/>
+        <location filename="../qt-ui/preferences.ui" line="463"/>
         <source>cu ft</source>
         <translation>куб. фут</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="455"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>celsius</source>
         <translation>цельсий</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="465"/>
+        <location filename="../qt-ui/preferences.ui" line="490"/>
         <source>fahrenheit</source>
         <translation>фаренгейт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="482"/>
+        <location filename="../qt-ui/preferences.ui" line="507"/>
         <source>kg</source>
         <translation>кг</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>пороговое значение pO₂</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>пороговое значение pN₂</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>пороговое значение pHe</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="636"/>
-        <source>max ppO₂ when showing MOD</source>
-        <translation>макс. ppO₂ при отображении MOD</translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="811"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="817"/>
+        <source>Proxy type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="830"/>
+        <source>Host</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="856"/>
+        <source>Port</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="882"/>
+        <source>Requires authentication</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="657"/>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="925"/>
+        <source>Password</source>
+        <translation>Пароль</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="682"/>
         <source>draw dive computer reported ceiling red</source>
         <translation>показывать потолок компьютера красным</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="747"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>System Default</source>
         <translation>Язык системы</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="767"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>Filter</source>
         <translation>Фильтр</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="419"/>
         <source>Pressure</source>
         <translation>Давление</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="421"/>
+        <location filename="../qt-ui/preferences.ui" line="446"/>
         <source>Volume</source>
         <translation>Объем</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="448"/>
+        <location filename="../qt-ui/preferences.ui" line="473"/>
         <source>Temperature</source>
         <translation>Температура</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="475"/>
+        <location filename="../qt-ui/preferences.ui" line="500"/>
         <source>Weight</source>
         <translation>Вес</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="517"/>
         <source>lbs</source>
         <translation>фунт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="507"/>
+        <location filename="../qt-ui/preferences.ui" line="532"/>
         <source>Time units</source>
         <translation>Единицы времени</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>Делитель скорости спуска/подъема</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="520"/>
+        <location filename="../qt-ui/preferences.ui" line="545"/>
         <source>Minutes</source>
         <translation>Минуты</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="530"/>
+        <location filename="../qt-ui/preferences.ui" line="555"/>
         <source>Seconds</source>
         <translation>Секунды</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="562"/>
+        <location filename="../qt-ui/preferences.ui" line="587"/>
         <source>Show</source>
         <translation>Показывать</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="693"/>
         <source>Show non-used cylinders in Equipment Tab</source>
         <translation>Показать неиспользованные балоны в табе оборудования</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>показать среднюю глубину</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>GFLow на макс. грубине</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="691"/>
+        <location filename="../qt-ui/preferences.ui" line="716"/>
         <source>Misc</source>
         <translation>Разное</translation>
     </message>
@@ -2075,35 +2228,65 @@ Please, remove them first.</source>
         <translation>Предпочтения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="697"/>
+        <location filename="../qt-ui/preferences.ui" line="722"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="739"/>
         <source>GFHigh</source>
         <translation>GFHigh</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="24"/>
+        <source>System proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="25"/>
+        <source>HTTP proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="26"/>
+        <source>SOCKS proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="245"/>
         <source>Restart required</source>
         <translation>Необходим перезапуск</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>Для смены языка необходимо перезапустить Subsurface.</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>Журнал по умолчанию</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>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="394"/>
+        <source>Warning</source>
+        <translation>Предупреждение</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"/>
+    </message>
 </context>
 <context>
     <name>PrintDialog</name>
@@ -2244,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>неизвестно</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>Погружение №%1 - %2</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>Макс. глубина: %1 %2</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>Длительность: %1 мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1918"/>
+        <location filename="../qt-ui/models.cpp" line="1898"/>
         <source>Gas Used:</source>
         <translation>Газы:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1920"/>
+        <location filename="../qt-ui/models.cpp" line="1900"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1922"/>
+        <location filename="../qt-ui/models.cpp" line="1902"/>
         <source>Max. CNS:</source>
         <translation>Макс. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1924"/>
+        <location filename="../qt-ui/models.cpp" line="1904"/>
         <source>Weights:</source>
         <translation>Грузы:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1929"/>
+        <location filename="../qt-ui/models.cpp" line="1909"/>
         <source>Notes:</source>
         <translation>Заметки:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1936"/>
+        <location filename="../qt-ui/models.cpp" line="1916"/>
         <source>Divemaster:</source>
         <translation>Инструктор:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1938"/>
+        <location filename="../qt-ui/models.cpp" line="1918"/>
         <source>Buddy:</source>
         <translation>Напарник:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1940"/>
+        <location filename="../qt-ui/models.cpp" line="1920"/>
         <source>Suit:</source>
         <translation>Костюм:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1942"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>Viz:</source>
         <translation>Видимость:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1944"/>
+        <location filename="../qt-ui/models.cpp" line="1924"/>
         <source>Rating:</source>
         <translation>Рейтинг:</translation>
     </message>
@@ -2317,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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/>
+        <source>Make first divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="906"/>
+        <source>Delete this divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="913"/>
         <source>Add Gas Change</source>
         <translation>Добавить замену смеси</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>Добавить закладку</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>Удалить событие</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>Скрыть похожие события</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>Редактировать имя</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>Показать все события</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>Скрыть событие</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>Спрятать все %1 события?</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>Удалить выбранное событие?</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>%1 @ %2:%3</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>Редактировать имя закладки</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>Имя:</translation>
     </message>
@@ -2380,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>воздух</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>Удалить эту точку</translation>
     </message>
@@ -2395,22 +2593,22 @@ Please, remove them first.</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="34"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation>Средняя</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="37"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation>Минимум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="40"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation>Максимум</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>Выберите место на карте двойным щелчком мыши.</translation>
     </message>
@@ -2424,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>Начать нумерацию с</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="126"/>
+        <source>New number</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchBar</name>
+    <message>
+        <location filename="../qt-ui/searchbar.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ShiftImageTimesDialog</name>
@@ -2441,42 +2653,47 @@ Please, remove them first.</source>
         <translation>Сдвинуть время изображения(-ий) на</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="102"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="95"/>
+        <source>h:mm</source>
+        <translation>h:mm</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="105"/>
         <source>earlier</source>
         <translation>раньше</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="109"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="112"/>
         <source>later</source>
         <translation>позже</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>Чтобы вычислить сдвиг времени между часами дайвкомпьютера и камеры, необходимо сфотографировать дисплей дайвкомпьютера отображающий текущее время. Скачайте эту фотографию на компьютер и нажмите эту кнопку.</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>Вычислить сдвиг времени камеры.</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>Выбрать изображения отображающие время на дайвкомпьютере</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>Какое время и дата отображены на изображении?</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>Открыть изображения</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>Изображения (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2556,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>Вебсервис</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/>
         <source>Connecting...</source>
         <translation>Соединение...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="421"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="419"/>
         <source>Download finished</source>
         <translation>Загрузка завершена</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>Ошибка загрузки: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/>
         <source>Connection Error: </source>
         <translation>Ошибка соединения:</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>Неверный идентификатор пользователя!</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>Невозможно разобрать ответ!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/>
         <source>Download Success!</source>
         <translation>Успешная загрузка!</translation>
     </message>
@@ -2607,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>Описание</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>ml</source>
         <translation>мл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>bar</source>
         <translation>Бар</translation>
     </message>
@@ -2625,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>Информация</translation>
     </message>
@@ -2633,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>Проверить обновления.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="37"/>
-        <source>&lt;h3&gt;Subsurface was unable to check for updates.&lt;/h3&gt;</source>
-        <translation>&lt;h3&gt;Subsurface не смог проверить обновления.&lt;/h3&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="36"/>
+        <source>Subsurface was unable to check for updates.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
-        <source>&lt;br/&gt;&lt;b&gt;The following error occurred:&lt;/b&gt;&lt;br/&gt;</source>
-        <translation>&lt;br/&gt;&lt;b&gt;Возникла следующая ошибка:&lt;/b&gt;&lt;br/&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="41"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="43"/>
-        <source>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Please check your internet connection.&lt;/b&gt;</source>
-        <translation>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Пожалуйста, проверьте соединение с интернетом.&lt;/b&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
     </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>Вы используете самую актуальную версию Subsurface.</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>Доступна новая верся Subsurface.&lt;br/&gt;Кликинте по:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt;, чтобы скачать.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="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>&lt;b&gt;Доступна новая версия Subsurface.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</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>Возникла ошибка во время проверки обновения.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -2676,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>Руководство пользователя</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>Руководство не найдено</translation>
     </message>
 </context>
 <context>
+    <name>UserSurvey</name>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="47"/>
+        <source>Subsurface User Survey</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="79"/>
+        <source>Recreational DIver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="92"/>
+        <source>Tech Diver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="105"/>
+        <source>Interested in dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="118"/>
+        <source>I am downloading dives from supported dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="131"/>
+        <source>I am importing dives from other software / sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="144"/>
+        <source>I am manually entering dives</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="190"/>
+        <source>Please type suggestions (in English) in the following box</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="27"/>
+        <source>
+Operating System: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="30"/>
+        <source>
+CPU Architecture: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="35"/>
+        <source>
+OS CPU Architecture %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="39"/>
+        <source>
+Language: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="73"/>
+        <source>Should we ask you later?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="74"/>
+        <source>Don&apos;t ask me again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="75"/>
+        <source>Ask Later</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="76"/>
+        <source>Ask again?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <source>Submit User Survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <source>Subsurface was unable to submit the user survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="101"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="102"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="111"/>
+        <source>Survey successfully submitted.</source>
+        <translation type="unfinished"/>
+    </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>Возникла ошибка во время проверки обновения.&lt;br/&gt;&lt;br/&gt;%1</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>Описание</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="723"/>
+        <location filename="../qt-ui/models.cpp" line="721"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
@@ -2742,12 +3097,12 @@ Please, remove them first.</source>
         <translation>Выгрузить</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>Таймаут выполнения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="279"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="277"/>
         <source>Transfering data...</source>
         <translation>Передача данных...</translation>
     </message>
@@ -2755,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>Тип</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="368"/>
+        <location filename="../qt-ui/models.cpp" line="373"/>
         <source>Weight</source>
         <translation>Вес</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>Удалить эту грузовую систему.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="453"/>
+        <location filename="../qt-ui/models.cpp" line="458"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="454"/>
+        <location filename="../qt-ui/models.cpp" line="459"/>
         <source>lbs</source>
         <translation>фунт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="478"/>
+        <location filename="../qt-ui/models.cpp" line="483"/>
         <source>ft</source>
         <translation>фут</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="484"/>
         <source>m</source>
         <translation>м</translation>
     </message>
@@ -2793,79 +3148,79 @@ 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>Год 
  &gt; Месяц / Поездка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>#</source>
         <translation>№</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1643"/>
         <source>Duration 
  Total</source>
         <translation>Длительность
 Общее</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>
 Average</source>
         <translation>
 Среднее</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>
 Shortest</source>
         <translation>
 Кратчайшее</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>
 Longest</source>
         <translation>
 Самое долгое</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>Глубина (%1)
 Среднее</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>
 Минимум</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>
 Максимум</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>SAC (%1)
 Среднее</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>Темп. (%1)
@@ -2875,99 +3230,92 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="58"/>
+        <location filename="../dive.c" line="87"/>
         <source>pascal</source>
         <translation>Па</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>Бар</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>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="104"/>
-        <location filename="../qt-gui.cpp" line="292"/>
-        <source>l</source>
-        <translation>л</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>куб. фут</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>м</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>фут</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>фунт</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>кг</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1120"/>
+        <location filename="../dive.c" line="1237"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) или (%s)</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>воздух</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="170"/>
+        <location filename="../equipment.c" line="210"/>
         <source>integrated</source>
         <translation>интегрированный</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="171"/>
+        <location filename="../equipment.c" line="211"/>
         <source>belt</source>
         <translation>пояс</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="172"/>
+        <location filename="../equipment.c" line="212"/>
         <source>ankle</source>
         <translation>груз на ноги</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="173"/>
+        <location filename="../equipment.c" line="213"/>
         <source>backplate weight</source>
         <translation>груз на пластину</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="174"/>
+        <location filename="../equipment.c" line="214"/>
         <source>clip-on</source>
         <translation>карабины</translation>
     </message>
@@ -2984,253 +3332,253 @@ Maximum</source>
         <translation>Для импорта CSV максимально допустимое кол-во колонок %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>none</source>
         <translation>отсутствует</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>deco stop</source>
         <translation>деко стоп</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>rbt</source>
         <translation>оставшееся время на дне</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ascent</source>
         <translation>подъем</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ceiling</source>
         <translation>потолок</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>workload</source>
         <translation>нагрузка</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>transmitter</source>
         <translation>передатчик</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>violation</source>
         <translation>нарушение</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>bookmark</source>
         <translation>закладка</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>surface</source>
         <translation>поверхность</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>safety stop</source>
         <translation>остановка безопасности</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>замена смеси</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (voluntary)</source>
         <translation>остановка безопасности (добровольно)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (mandatory)</source>
         <translation>остановка безопасности (обязательно)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>deepstop</source>
         <translation>глубокая остановка</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>ceiling (safety stop)</source>
         <translation>потолок (остановка безопасности)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>divetime</source>
         <translation>время погружения</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>ниже пола</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>maxdepth</source>
         <translation>макс. глуб.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>airtime</source>
         <translation>оставшееся время по воздуху</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>heading</source>
         <translation>направление</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>tissue level warning</source>
         <translation>насыщение тканей</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>non stop time</source>
         <translation>время без остановки</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="163"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>invalid event number</source>
         <translation>неверный номер события</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>Невозможно создать анализатор для %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="411"/>
+        <location filename="../libdivecomputer.c" line="414"/>
         <source>Error registering the data</source>
         <translation>Ошибка регистрации данных</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="419"/>
+        <location filename="../libdivecomputer.c" line="422"/>
         <source>Error parsing the datetime</source>
         <translation>Ошибка разбора даты/времени</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="438"/>
         <source>Dive %d: %s %d %04d</source>
         <translation>Погружение %d: %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="440"/>
+        <location filename="../libdivecomputer.c" line="443"/>
         <source>Error parsing the divetime</source>
         <translation>Ошибка разбора времени погружения</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="449"/>
+        <location filename="../libdivecomputer.c" line="452"/>
         <source>Error parsing the maxdepth</source>
         <translation>Ошибка разбора макс. глубины</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="458"/>
+        <location filename="../libdivecomputer.c" line="461"/>
         <source>Error parsing the gas mix count</source>
         <translation>Ошибка разбора счетчика смесей</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="470"/>
+        <location filename="../libdivecomputer.c" line="473"/>
         <source>Error obtaining water salinity</source>
         <translation>Ошибка получения солености воды</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error obtaining surface pressure</source>
         <translation>Ошибка получения давления на поверхности</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the gas mix</source>
         <translation>Ошибка разбора смеси</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="493"/>
+        <location filename="../libdivecomputer.c" line="496"/>
         <source>Error parsing the samples</source>
         <translation>Ошибка разбора выборки</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="623"/>
+        <location filename="../libdivecomputer.c" line="626"/>
         <source>Event: waiting for user action</source>
         <translation>Событие: ожидание действия пользователя</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>модель=%u (0x%08x), прошивка=%u (0x%08x), серийный номер=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="691"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the event handler.</source>
         <translation>Ошибка регистрации обработчика событий.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="696"/>
+        <location filename="../libdivecomputer.c" line="699"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Ошибка регистрации обработчика завершения.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="717"/>
+        <location filename="../libdivecomputer.c" line="720"/>
         <source>Dive data import error</source>
         <translation>Ошибка импорта данных погружения</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="756"/>
+        <location filename="../libdivecomputer.c" line="759"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Невозможно создать контекст libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="763"/>
+        <location filename="../libdivecomputer.c" line="766"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Невозможно открыть %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="462"/>
+        <location filename="../parse-xml.c" line="466"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Странное значение процентов %s
 </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>Ошибка разбора &apos;%s&apos;</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>Ошибка запроса get_events в БД.
 </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>Запрос get_tags в базу не выполнился.
@@ -3244,111 +3592,160 @@ Maximum</source>
 </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 '%s'.
 </source>
         <translation>Ошибка запроса к БД &apos;%s&apos;.
 </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>Запрос get_cylinders в базу не выполнился.
 </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>Запрос get_changes в базу не выполнился.
 </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>Запрос get_profile_sample в базу не выполнился.
 </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>Невозможно открыть файл преобразования %s</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>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="146"/>
-        <location filename="../planner.c" line="617"/>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation>Не найдена смесь %d/%d</translation>
+        <location filename="../planner.c" line="159"/>
+        <location filename="../planner.c" line="752"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="308"/>
+        <location filename="../planner.c" line="345"/>
         <source>Too many gas mixes</source>
         <translation>Слишком много смесей</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="489"/>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation>%s
-План погружения Subsurface
-на основе значений нижний ГФ = %.0f и верхний ГФ = %.0f
-
-</translation>
+        <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>ОТКАЗ ОТ ОТВЕТСТВЕННОСТИ / ВНИМАНИЕ: В ПЛАНИРОВЩИКЕ ИСПОЛЬЗУЕТСЯ НОВАЯ РЕАЛИЗАЦИЯ АЛГОРИТМА БЮЛЬМАНА, КОТОРАЯ БЫЛА НЕДОСТАТОЧНО ПРОТЕСТИРОВАНА. МЫ НАСТОЯТЕЛЬНО РЕКОМЕНДУЕМ НЕ ПЛАНИРОВАТЬ ПОГРУЖЕНИЯ ТОЛЬКО НА ОСНОВЕ ЭТИХ РЕЗУЛЬТАТОВ.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="530"/>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Переход на %.*f %s за %d:%02d мин - рантайм %d:%02u на смеси %s
-</translation>
+        <location filename="../planner.c" line="535"/>
+        <source>based on GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="539"/>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Оставаться на %.*f %s в течение %d:%02d мин - рантайм %d:%02u на смеси %s
-</translation>
+        <location filename="../planner.c" line="538"/>
+        <source>Subsurface dive plan</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="550"/>
-        <source>Switch gas to %s
-</source>
-        <translation>Замена смеси на %s
-</translation>
+        <location filename="../planner.c" line="542"/>
+        <source>depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="558"/>
-        <source>Gas consumption:
-</source>
-        <translation>Расход газа:
-</translation>
+        <location filename="../planner.c" line="545"/>
+        <source>runtime</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="569"/>
-        <source>%.0f%s of %s
-</source>
-        <translation>%.0f%s %s
-</translation>
+        <location filename="../planner.c" line="548"/>
+        <source>duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="551"/>
+        <source>gas</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </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"/>
     </message>
     <message>
-        <location filename="../planner.c" line="810"/>
+        <location filename="../planner.c" line="606"/>
+        <source>%3.0f%s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
+        <source>%3dmin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="629"/>
+        <source>Switch gas to %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="638"/>
+        <source>Gas consumption:</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="659"/>
+        <source>this is more gas than available in the specified cylinder!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="664"/>
+        <source>not enough reserve for gas sharing on ascent!</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="668"/>
+        <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="980"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1226"/>
+        <location filename="../profile.c" line="1250"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3357,70 +3754,69 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1229"/>
+        <location filename="../profile.c" line="1253"/>
         <source>P: %d%s
 </source>
         <translation>Д: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1233"/>
+        <location filename="../profile.c" line="1257"/>
         <source>T: %.1f%s
 </source>
         <translation>Т: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1263"/>
         <source>V: %.1f%s
 </source>
         <translation>С: %.1f%s
 </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>SAC: %2.1fл/мин
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1244"/>
+        <location filename="../profile.c" line="1268"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1246"/>
+        <location filename="../profile.c" line="1270"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fбар
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1272"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fбар
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="1274"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fбар
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="1277"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1260"/>
+        <location filename="../profile.c" line="1284"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3429,7 +3825,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1264"/>
+        <location filename="../profile.c" line="1288"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3438,402 +3834,395 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1276"/>
+        <location filename="../profile.c" line="1300"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Ост. безопасности: %uмин @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1279"/>
+        <location filename="../profile.c" line="1303"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Ост. безопасности: неизв. время @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="1308"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Деко: %uмин @ %.0f%с
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
+        <location filename="../profile.c" line="1311"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Деко: неиз. время @ %.0f%с
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1291"/>
+        <location filename="../profile.c" line="1315"/>
         <source>In deco
 </source>
         <translation>В деко
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1293"/>
+        <location filename="../profile.c" line="1317"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %uмин
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1297"/>
+        <location filename="../profile.c" line="1321"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Деко: %uмин @ %.0f%с (вычисл.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1305"/>
+        <location filename="../profile.c" line="1329"/>
         <source>In deco (calc)
 </source>
         <translation>В деко (вычисл.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1307"/>
+        <location filename="../profile.c" line="1331"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %uмин (вычисл.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1310"/>
+        <location filename="../profile.c" line="1334"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %uмин (вычисл.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1313"/>
+        <location filename="../profile.c" line="1337"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Расчетный потолок %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1319"/>
+        <location filename="../profile.c" line="1343"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Ткань %.0fмин: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1325"/>
+        <location filename="../profile.c" line="1349"/>
         <source>heartbeat: %d
 </source>
         <translation>пульс: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1327"/>
+        <location filename="../profile.c" line="1351"/>
         <source>bearing: %d
 </source>
         <translation>азимут: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1419"/>
+        <location filename="../profile.c" line="1443"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</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>%s %sГ:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1435"/>
+        <location filename="../profile.c" line="1459"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sГ:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1439"/>
+        <location filename="../profile.c" line="1463"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sС:%.2f%s</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>%s %sС:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1454"/>
+        <location filename="../profile.c" line="1478"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sД:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="273"/>
+        <location filename="../qt-gui.cpp" line="281"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="276"/>
+        <location filename="../qt-gui.cpp" line="284"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="392"/>
-        <source>%1, %2 %3, %4 %5:%6</source>
-        <translation>%1, %2 %3, %4 %5:%6</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="405"/>
-        <source>%1 %2, %3
-%4:%5</source>
-        <translation>%1 %2, %3
-%4:%5</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="418"/>
+        <location filename="../qt-gui.cpp" line="417"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 погружений)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="423"/>
+        <location filename="../qt-gui.cpp" line="422"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 погружение)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>boat</source>
         <translation>с лодки</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>shore</source>
         <translation>с берега</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>drift</source>
         <translation>течение</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>deep</source>
         <translation>глубокое</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>cavern</source>
         <translation>каверна</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>ice</source>
         <translation>подледное</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>wreck</source>
         <translation>рэк</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>cave</source>
         <translation>пещера</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>altitude</source>
         <translation>высокогорье</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>pool</source>
         <translation>бассейн</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>lake</source>
         <translation>в озере</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>river</source>
         <translation>в реке</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>night</source>
         <translation>ночное</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>fresh</source>
         <translation>пресная</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>student</source>
         <translation>ученик</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>photo</source>
         <translation>фото</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>video</source>
         <translation>видео</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>instructor</source>
         <translation>инструктор</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="25"/>
         <source>deco</source>
         <translation>деко стоп</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="216"/>
+        <location filename="../dive.c" line="133"/>
+        <source>ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="214"/>
         <source>more than %d days</source>
         <translation>более %d дней</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="220"/>
         <source>%dd %dh %dmin</source>
         <translation>%dд %dч %dмин</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="224"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dh %dmin</source>
         <translation>%dч %dмин</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="235"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation>для погружений №</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="242"/>
+        <location filename="../statistics.c" line="240"/>
         <source>for selected dives</source>
         <translation>для выбранных погружений</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="275"/>
         <source>for dive #%d</source>
         <translation>для погружения №%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for selected dive</source>
         <translation>для выбранного погружения</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for all dives</source>
         <translation>для всех погружений</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="283"/>
+        <location filename="../statistics.c" line="281"/>
         <source>(no dives)</source>
         <translation>(нет погружений)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sun</source>
         <translation>Вск</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Mon</source>
         <translation>Пнд</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Tue</source>
         <translation>Втр</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Wed</source>
         <translation>Срд</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Thu</source>
         <translation>Чтв</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Fri</source>
         <translation>Птн</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sat</source>
         <translation>Суб</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jan</source>
         <translation>Янв</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Feb</source>
         <translation>Фев</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Mar</source>
         <translation>Мар</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Apr</source>
         <translation>Апр</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>May</source>
         <translation>Май</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jun</source>
         <translation>Июн</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Jul</source>
         <translation>Июл</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Aug</source>
         <translation>Авг</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Sep</source>
         <translation>Снт</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Oct</source>
         <translation>Окт</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Nov</source>
         <translation>Ноя</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Dec</source>
         <translation>Дек</translation>
     </message>
@@ -3863,97 +4252,97 @@ Is the Uemis Zurich plugged in correctly?</source>
 Проверьте подключение Uemis Zurich.</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="107"/>
+        <location filename="../uemis-downloader.c" line="111"/>
         <source>unknown</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="379"/>
+        <location filename="../uemis-downloader.c" line="383"/>
         <source>Reading %s %s</source>
         <translation>Чтение %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="399"/>
+        <location filename="../uemis-downloader.c" line="403"/>
         <source>data</source>
         <translation>данные</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="420"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>divelog entry id</source>
         <translation>ид. записи журнала</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="422"/>
+        <location filename="../uemis-downloader.c" line="426"/>
         <source>divespot data id</source>
         <translation>ид. места погружения</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
+        <location filename="../uemis-downloader.c" line="428"/>
         <source>more data dive id</source>
         <translation>ид. дополнительных данных погружения</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>wetsuit</source>
         <translation>мокрый</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>semidry</source>
         <translation>полусухой</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>drysuit</source>
         <translation>сухой</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>shorty</source>
         <translation>короткий</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>vest</source>
         <translation>жилет</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>long john</source>
         <translation>комбинезон</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>jacket</source>
         <translation>куртка</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>full suit</source>
         <translation>полный</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>2 pcs full suit</source>
         <translation>полный из 2-х</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="620"/>
+        <location filename="../uemis-downloader.c" line="624"/>
         <source>membrane</source>
         <translation>мембрана</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="802"/>
+        <location filename="../uemis-downloader.c" line="823"/>
         <source>Init Communication</source>
         <translation>Инициализация связи</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="804"/>
+        <location filename="../uemis-downloader.c" line="825"/>
         <source>Uemis init failed</source>
         <translation>Ошибка инициализации Uemis</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="815"/>
+        <location filename="../uemis-downloader.c" line="836"/>
         <source>Start download</source>
         <translation>Начать загрузку</translation>
     </message>
@@ -3974,18 +4363,18 @@ Is the Uemis Zurich plugged in correctly?</source>
     </message>
     <message>
         <location filename="../uemis.c" line="203"/>
-        <source>PO2 Green Warning</source>
-        <translation>Внимание: PO2 (зеленый)</translation>
+        <source>pO₂ Green Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
-        <source>PO2 Ascend Warning</source>
-        <translation>Внимание: PO2 при подъеме</translation>
+        <source>pO₂ Ascend Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="208"/>
-        <source>PO2 Ascend Alarm</source>
-        <translation>Тревога: PO2 при подъеме</translation>
+        <source>pO₂ Ascend Alarm</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
@@ -4047,5 +4436,214 @@ Is the Uemis Zurich plugged in correctly?</source>
         <source>Low Battery Alert</source>
         <translation>Тревога: заряд батареи</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"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="36"/>
+        <source>Date:</source>
+        <translation>Дата:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="38"/>
+        <source>Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="40"/>
+        <source>Duration:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="41"/>
+        <source>min</source>
+        <translation>мин</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="43"/>
+        <source>Max Depth:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="46"/>
+        <source>Air Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="48"/>
+        <source>Water Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="50"/>
+        <source>Location:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="54"/>
+        <source>Notes:</source>
+        <translation>Заметки:</translation>
+    </message>
+</context>
+<context>
+    <name>plannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="35"/>
+        <source>Rates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="56"/>
+        <source>Ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="77"/>
+        <source>below 75% avg. depth</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="94"/>
+        <source>75%-50% avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="111"/>
+        <source>50% avg. depth - 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="128"/>
+        <source>6m/20ft to surface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="148"/>
+        <source>Descent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="200"/>
+        <source>surface to the bottom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="226"/>
+        <source>Planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="247"/>
+        <source>GF low</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="264"/>
+        <source>GF high</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
+        <source>Drop to first depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
+        <source>Last Stop at 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>plan backgas breaks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="318"/>
+        <source>Gas Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <source>bottom SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="349"/>
+        <source>deco SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="359"/>
+        <source>bottom pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="389"/>
+        <source>bar</source>
+        <translation>Бар</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="382"/>
+        <source>deco pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="421"/>
+        <source>Dive Notes</source>
+        <translation>Погружение</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="445"/>
+        <source>display runtime</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="458"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="461"/>
+        <source>display segment duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="471"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="474"/>
+        <source>display transitions in deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="481"/>
+        <source>verbatim diveplan</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_sk_SK.ts b/translations/subsurface_sk_SK.ts
index ad3ddeb9f..93ec4f9d0 100644
--- a/translations/subsurface_sk_SK.ts
+++ b/translations/subsurface_sk_SK.ts
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="sk_SK" version="2.0">
+<defaultcodec>UTF-8</defaultcodec>
 <context>
     <name>CylindersModel</name>
     <message>
@@ -37,42 +38,42 @@
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="71"/>
+        <location filename="../qt-ui/models.cpp" line="70"/>
         <source>Switch at</source>
         <translation>Zmeň v</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>Kliknutím sem vymažeš fľašu</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>Flaša nemôže byť vymazaná</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>Táto fľaša sa používa. Len fšaše nepoužité na ponor môžu byť vymazané.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="507"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="508"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="527"/>
+        <location filename="../qt-ui/models.cpp" line="532"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="528"/>
+        <location filename="../qt-ui/models.cpp" line="533"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -100,22 +101,22 @@ vybraný počítač?</translation>
 <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>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Device ID</source>
         <translation>ID zariadenia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Nickname</source>
         <translation>Voliteľný názov</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>Kliknutín sem vymažeš počítač.</translation>
     </message>
@@ -123,190 +124,326 @@ vybraný počítač?</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="90"/>
-        <source>air</source>
-        <translation>vzduch</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="92"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</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>Záchrana na OC</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>začiatok</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>koniec</translation>
     </message>
 </context>
 <context>
-    <name>DiveGasPressureItem</name>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="475"/>
-        <source>air</source>
-        <translation>vzduch</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="476"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-</context>
-<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1258"/>
-        <source> l/min</source>
-        <translation>l/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
-        <source> cuft/min</source>
-        <translation>cuft/min</translation>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <source>/min</source>
+        <translation>/min</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>Zobraz vyhľadávací box</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="706"/>
         <source>expand all</source>
         <translation>zobraz všetky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="740"/>
+        <location filename="../qt-ui/divelistview.cpp" line="707"/>
         <source>collapse all</source>
         <translation>zbaľ všetky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="741"/>
+        <location filename="../qt-ui/divelistview.cpp" line="708"/>
         <source>collapse others</source>
         <translation>zbaľ ostatné</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>vymaž ponor(y) z akcie</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>vytvor novú akciu vyššie</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>pridaj ponor(y) do akcie hneď nad</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>pridaj ponor(y) do akcie pod</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>spoj akciu s akciou vyššie</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>spoj akciu s akciou nižšie</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>zmaž ponor(y)</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>označ neplatné ponor(y)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
-        <source>save As</source>
-        <translation>uložiť ako</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="763"/>
-        <source>export As UDDF</source>
-        <translation>exportuj ako UDDF</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="764"/>
-        <source>export As CSV</source>
-        <translation>exportovať ako CSV</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="744"/>
+        <source>renumber dive(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="765"/>
+        <location filename="../qt-ui/divelistview.cpp" line="745"/>
         <source>shift times</source>
         <translation>posun času</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="766"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>load images</source>
         <translation>nahrať fotky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="769"/>
-        <source>upload dive(s) to divelogs.de</source>
-        <translation>nahraj ponor(y) na </translation>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Open Image Files</source>
+        <translation>Otvoriť súbory s fotkami</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation>Graficke súbory (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <source>merge selected dives</source>
+        <translation>zluč vybrané ponory</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="24"/>
+        <source>General Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="30"/>
+        <source>Export format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="42"/>
+        <source>Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="61"/>
+        <source>UDDF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="74"/>
+        <source>divelogs.de</source>
+        <translation>sk.divelogs.de</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="84"/>
+        <source>CSV</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="94"/>
+        <source>Worldmap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="107"/>
+        <source>Selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="116"/>
+        <source>Selected dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="126"/>
+        <source>All dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="178"/>
+        <source>HTML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="184"/>
+        <source>General Settings</source>
+        <translation>Všeobecné nastavenia</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="190"/>
+        <source>Subsurface Numbers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="203"/>
+        <source>Selected Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="216"/>
+        <source>Minimum Javascript</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="229"/>
+        <source>All Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="239"/>
+        <source>Export List only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="252"/>
+        <source>Style Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="264"/>
+        <source>Font</source>
+        <translation>Font</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="274"/>
+        <source>Font size</source>
+        <translation>Veľkosť fontu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="795"/>
-        <source>Save Dives As...</source>
-        <translation>Uložiť ponory ako...</translation>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
+        <source>8</source>
+        <translation>8</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="814"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <source>10</source>
+        <translation>10</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <source>12</source>
+        <translation>12</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <source>14</source>
+        <translation>14</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <source>16</source>
+        <translation>16</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <source>18</source>
+        <translation>18</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <source>20</source>
+        <translation>20</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="323"/>
+        <source>Theme</source>
+        <translation>Téma</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <source>Sand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="153"/>
         <source>Export UDDF File as</source>
-        <translation>Exportovať IDDF súbor ako</translation>
+        <translation>Exportovať UDDF súbor ako</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>UDDF súbory (*.uddf *.UDDF)</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>Exportovať CSV súbor ako</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>CSV súbory (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Open Image Files</source>
-        <translation>Otvoriť súbory s fotkami</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="162"/>
+        <source>Export World Map</source>
+        <translation>Exportuj World Map</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
-        <translation>Graficke súbory (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="163"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="177"/>
+        <source>HTML files (*.html)</source>
+        <translation>HTML súbory (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="760"/>
-        <source>merge selected dives</source>
-        <translation>zluč vybrané ponory</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="167"/>
+        <source>Export Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="168"/>
+        <source>XML files (*.xml *.ssrf)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="176"/>
+        <source>Export HTML files as</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -317,138 +454,133 @@ vybraný počítač?</translation>
         <translation>Import log súboru</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="36"/>
-        <source>Import CSV Dive Log Files</source>
-        <translation>Import CSV log súborov</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="50"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
         <source>CSV options</source>
         <translation>CSV možnosti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="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>Oddeľovač položiek</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>Predkonfigurovaný import</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>Configurácia položiek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="80"/>
         <source>Depth</source>
         <translation>Hĺbka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="100"/>
         <source>Stopdepth</source>
         <translation>Deco stop</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="107"/>
         <source>PO2</source>
         <translation>PO2</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>Čas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="121"/>
         <source>Temp</source>
         <translation>Teplota</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="151"/>
         <source>Cns</source>
         <translation>Cns</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>Jednotky</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>Metrický</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>Imperiálny</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="283"/>
         <source>Dive #</source>
         <translation>Ponor #</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="317"/>
         <source>Date</source>
         <translation>Dátum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="385"/>
         <source>Duration</source>
         <translation>Dĺžka (min)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="470"/>
         <source>Tags</source>
         <translation>Značky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
         <source>Location</source>
         <translation>Miesto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="453"/>
         <source>Gps</source>
         <translation>Gps</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="300"/>
         <source>Max depth</source>
         <translation>Max. hlbka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="334"/>
         <source>Mean depth</source>
         <translation>Stredná hlbka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="368"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="402"/>
         <source>Notes</source>
         <translation>Poznámky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="436"/>
         <source>Weight</source>
         <translation>Hmotnosť</translation>
     </message>
@@ -456,105 +588,70 @@ vybraný počítač?</translation>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="71"/>
-        <source>Bottom SAC</source>
-        <translation>SAC na dne</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="85"/>
-        <source>SAC on DECO Stop</source>
-        <translation>SAC na DECO zastávke</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="78"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="98"/>
-        <source>GFLow</source>
-        <translation>GFLow</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="125"/>
-        <source>Last Stop at 6m</source>
-        <translation>Posledná zastávka v 6m</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="106"/>
+        <source>Planned Dive Time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="174"/>
-        <source>Start Time</source>
-        <translation>Začiatok</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="134"/>
+        <source>Altitude</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="181"/>
+        <location filename="../qt-ui/diveplanner.ui" line="141"/>
         <source>ATM Pressure</source>
         <translation>ATM tlak</translation>
     </message>
-</context>
-<context>
-    <name>DivePlannerGraphics</name>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="114"/>
-        <source>10m</source>
-        <translation>10m</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="116"/>
-        <source>30ft</source>
-        <translation>30 stôp</translation>
-    </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="363"/>
-        <source>Handler Position Error</source>
+        <location filename="../qt-ui/diveplanner.ui" line="148"/>
+        <source>mbar</source>
         <translation type="unfinished"/>
     </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>
-        <translation>Jedna alebo viac zastávok budu touto operáciou zrušené.
-Vymaž ich prosím.</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="158"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="445"/>
-        <source>AIR</source>
-        <translation>Vzduch</translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="137"/>
+        <source>unknown</source>
+        <translation>neznámy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1148"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="586"/>
         <source>Final Depth</source>
         <translation>Cieľová hĺbka</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1152"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="590"/>
         <source>Duration</source>
         <translation>Dĺžka (min)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1154"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="592"/>
         <source>Used Gas</source>
         <translation>Použitá zmes</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1391"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="887"/>
         <source>Discard the Plan?</source>
         <translation>Vymazať plán?</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>Chystáš sa vymazať svoj plán.</translation>
     </message>
@@ -562,17 +659,17 @@ Vymaž ich prosím.</translation>
 <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"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="256"/>
         <source>Available Gases</source>
         <translation>Zmesi k dispozícií</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"/>
     </message>
@@ -616,8 +713,23 @@ Vymaž ich prosím.</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
-        <source>Pressure  S</source>
-        <translation>Tlak S</translation>
+        <source>Pressure S</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <source>pN₂</source>
+        <translation>pN₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>pHe</source>
+        <translation>pHe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
@@ -634,86 +746,71 @@ Vymaž ich prosím.</translation>
         <source>SAC</source>
         <translation>Spotreba plynu</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
-        <source>PN2</source>
-        <translation>PN2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
-        <source>PHE</source>
-        <translation>PHE</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
-        <source>PO2</source>
-        <translation>PO2</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>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>date</source>
         <translation>dátum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1298"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>lbs</source>
         <translation>US libra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
+        <location filename="../qt-ui/models.cpp" line="1307"/>
         <source>suit</source>
         <translation>oblek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1310"/>
         <source>cyl</source>
         <translation>fl.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1344"/>
+        <location filename="../qt-ui/models.cpp" line="1325"/>
         <source>location</source>
         <translation>lokalita</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1316"/>
         <source>SAC</source>
         <translation>Spotreba plynu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1338"/>
+        <location filename="../qt-ui/models.cpp" line="1319"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1341"/>
+        <location filename="../qt-ui/models.cpp" line="1322"/>
         <source>maxCNS</source>
         <translation>max. CNS</translation>
     </message>
@@ -721,115 +818,115 @@ Vymaž ich prosím.</translation>
 <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>Neplatná odpoveď zo servera</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>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</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>Očakávaný XML tag &apos;DiveDates&apos; nebol nájdený</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>Nekorektná XML odpoveď. Riadok %1: %2</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>neboli vybrané žiadne ponory</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>vytvorenie zip súboru pre upload zlyhalo: %s</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>zlyhalo vytvorenie dočasného súboru: %s</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>interná chyba: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="181"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="179"/>
         <source>internal error</source>
         <translation>interná chyba</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>Hotovo</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>Nahrávanie zoznamu ponorov...</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>Sťahovanie zoznamu ponorov...</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>Sťahovanie %1 ponorov...</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>Sťahovanie ukončené</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
         <source>Corrupted download</source>
         <translation>Poškodené sťahovanie</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>Nemôžem otvoriť archív:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Upload failed</source>
         <translation>Nahrávanie zlýhalo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="849"/>
         <source>Upload successful</source>
         <translation>Úspešne nahrávanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="854"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="852"/>
         <source>Login failed</source>
         <translation>Prihlásenie zlýhalo</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>Neviem spracovať odpoveď</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="868"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Error: %1</source>
         <translation>Chyba:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="835"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/>
         <source>Upload finished</source>
         <translation>Nahrávanie ukončené</translation>
     </message>
@@ -837,54 +934,54 @@ Vymaž ich prosím.</translation>
 <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>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="165"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/>
         <source>Error</source>
         <translation>Chyba</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>Skús znovu</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>Hladať Uemis DC</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="323"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="325"/>
         <source>Log files (*.log)</source>
         <translation>Log súbory</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="339"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
         <source>Warning</source>
         <translation>Upozornenie</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="353"/>
         <source>Dump files (*.bin)</source>
         <translation>Dump súbory</translation>
     </message>
@@ -952,7 +1049,7 @@ Vymaž ich prosím.</translation>
 <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>Edituj označené potápašské lokality</translation>
     </message>
@@ -961,848 +1058,854 @@ Vymaž ich prosím.</translation>
     <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>Poznámky</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>Miesto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="148"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Coordinates</source>
         <translation>Súradnice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="169"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="155"/>
+        <location filename="../qt-ui/maintab.ui" line="148"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="63"/>
-        <source>Start time</source>
-        <translation>Začiatok ponoru</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>Teplota vzduchu</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>Teplota vody</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="127"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Tags</source>
         <translation>Značky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="223"/>
         <source>Rating</source>
         <translation>Hodnotenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="236"/>
         <source>Visibility</source>
         <translation>Viditeľnosť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="215"/>
+        <location filename="../qt-ui/maintab.ui" line="127"/>
         <source>Suit</source>
         <translation>Oblek</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>Poznámky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="270"/>
+        <location filename="../qt-ui/maintab.ui" line="311"/>
         <source>Equipment</source>
         <translation>Výstroj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="350"/>
+        <location filename="../qt-ui/maintab.ui" line="391"/>
         <source>Dive Info</source>
         <translation>Informácie</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>Dátum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="414"/>
+        <location filename="../qt-ui/maintab.ui" line="275"/>
+        <source>Time</source>
+        <translation>Čas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="455"/>
         <source>Interval</source>
         <translation>Povrch. interval</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="433"/>
+        <location filename="../qt-ui/maintab.ui" line="474"/>
         <source>Gases Used</source>
         <translation>Použité zmesi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="452"/>
+        <location filename="../qt-ui/maintab.ui" line="493"/>
         <source>Gas Consumed</source>
         <translation>Spotrebovaná zmes</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>Spotreba plynu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="531"/>
         <source>Max. Depth</source>
         <translation>Max. hĺbka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="509"/>
+        <location filename="../qt-ui/maintab.ui" line="550"/>
         <source>Ave. Depth</source>
         <translation>Priem. hĺbka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="528"/>
+        <location filename="../qt-ui/maintab.ui" line="569"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="547"/>
+        <location filename="../qt-ui/maintab.ui" line="588"/>
         <source>Air Pressure</source>
         <translation>Tlak vzduchu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="566"/>
+        <location filename="../qt-ui/maintab.ui" line="607"/>
         <source>Air Temperature</source>
         <translation>Teplota vzduchu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="585"/>
+        <location filename="../qt-ui/maintab.ui" line="626"/>
         <source>Water Temperature</source>
         <translation>Teplota vody</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="604"/>
+        <location filename="../qt-ui/maintab.ui" line="645"/>
         <source>Dive Time</source>
         <translation>Čas Ponoru</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="623"/>
+        <location filename="../qt-ui/maintab.ui" line="664"/>
         <source>Salinity</source>
         <translation>Slanosť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="660"/>
+        <location filename="../qt-ui/maintab.ui" line="701"/>
         <source>Stats</source>
         <translation>Štatistiky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="746"/>
         <source>Depth</source>
         <translation>Hĺbka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Temperature</source>
         <translation>Teplota</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="784"/>
         <source>Duration</source>
         <translation>Dĺžka (min)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Total Time</source>
         <translation>Celkový čas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="835"/>
         <source>Dives</source>
         <translation>Ponory</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="919"/>
+        <source>Photos</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="89"/>
         <source>Cylinders</source>
         <translation>Fľaše</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="90"/>
         <source>Add Cylinder</source>
         <translation>Pridaj fľašu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="93"/>
         <source>Weights</source>
         <translation>Závažia</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>Pridaj závažia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="438"/>
+        <location filename="../qt-ui/maintab.cpp" line="409"/>
         <source>Trip Location</source>
         <translation>Lokalita</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>Poznámky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="42"/>
+        <location filename="../qt-ui/maintab.cpp" line="48"/>
         <source>Save</source>
         <translation>Uložiť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="46"/>
+        <location filename="../qt-ui/maintab.cpp" line="52"/>
         <source>Cancel</source>
         <translation>Zrušiť</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>Teplota vzduchu [%1]</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>Teplota vody [%1]</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>Táto akcia je editovaná.</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>Viaceré ponory sú editované.</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>Tento ponor sa edituje.</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>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="494"/>
+        <location filename="../qt-ui/maintab.cpp" line="464"/>
         <source>unknown</source>
         <translation>neznámy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>N</source>
-        <translation>N</translation>
+        <location filename="../qt-ui/maintab.cpp" line="501"/>
+        <source>Deepest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>S</source>
-        <translation>S</translation>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <source>Shallowest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>E</source>
-        <translation>E</translation>
+        <location filename="../qt-ui/maintab.cpp" line="794"/>
+        <source>Discard the Changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>W</source>
-        <translation>W</translation>
+        <location filename="../qt-ui/maintab.cpp" line="795"/>
+        <source>You are about to discard your changes.</source>
+        <translation type="unfinished"/>
     </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>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="571"/>
+        <location filename="../qt-ui/mainwindow.ui" line="646"/>
         <source>&amp;File</source>
         <translation>&amp;Súbor</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="583"/>
+        <source>Print</source>
+        <translation>Tlačiť</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:'Courier'; 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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="606"/>
+        <location filename="../qt-ui/mainwindow.ui" line="679"/>
         <source>&amp;View</source>
         <translation>&amp;Náhľad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="628"/>
+        <location filename="../qt-ui/mainwindow.ui" line="701"/>
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="636"/>
+        <location filename="../qt-ui/mainwindow.ui" line="709"/>
         <source>&amp;Import</source>
         <translation>&amp;Import</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>&amp;Nový logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="655"/>
+        <location filename="../qt-ui/mainwindow.ui" line="728"/>
         <source>New</source>
         <translation>Nový</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="658"/>
+        <location filename="../qt-ui/mainwindow.ui" line="731"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</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>&amp;Otvoriť logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="666"/>
+        <location filename="../qt-ui/mainwindow.ui" line="739"/>
         <source>Open</source>
         <translation>Otvor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <location filename="../qt-ui/mainwindow.ui" line="742"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="674"/>
+        <location filename="../qt-ui/mainwindow.ui" line="747"/>
         <source>&amp;Save</source>
         <translation>&amp;Uložiť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="677"/>
+        <location filename="../qt-ui/mainwindow.ui" line="750"/>
         <source>Save</source>
         <translation>Uložiť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="680"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>Save as</source>
         <translation>Uložiť ako</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>Ctrl+Shift+S</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>&amp;Zatvoriť</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Close</source>
         <translation>Zatvoriť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="702"/>
+        <location filename="../qt-ui/mainwindow.ui" line="775"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="902"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <source>P&amp;references</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="831"/>
+        <source>&amp;Add Dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <source>Auto &amp;Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="863"/>
+        <source>&amp;Dive List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="871"/>
+        <source>&amp;Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="879"/>
+        <source>&amp;Info</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="887"/>
+        <source>&amp;All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="895"/>
+        <source>P&amp;rev DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="903"/>
+        <source>&amp;Next DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="911"/>
+        <source>&amp;Select Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <source>&amp;About Subsurface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="937"/>
+        <source>&amp;Globe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="953"/>
+        <source>&amp;Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="959"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="707"/>
-        <source>Export &amp;UDDF</source>
-        <translation>Export &amp;UDDF</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="1008"/>
+        <source>&amp;Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1011"/>
+        <source>Export Dive Logs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1014"/>
+        <source>Ctrl+E</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Enable the pN2 Graph</source>
         <translation>Povoliť pN2 graf</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <location filename="../qt-ui/mainwindow.ui" line="128"/>
         <source>Enable the pHe graph</source>
         <translation>Povoliť pHe graf</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <location filename="../qt-ui/mainwindow.ui" line="290"/>
         <source>Show/hide heart rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <location filename="../qt-ui/mainwindow.ui" line="342"/>
         <source>Enable EAD, END, and EADD</source>
         <translation>Povoliť EAD, END, a EADD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="238"/>
         <source>Show NDL / TTS</source>
         <translation>Zobraziť </translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="456"/>
+        <location filename="../qt-ui/mainwindow.ui" line="394"/>
         <source>Rescale depth axis</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="710"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="715"/>
-        <source>Export HTML World Map</source>
-        <translation>Exportovať HTML World Map</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="718"/>
-        <source>Ctrl+H</source>
-        <translation>Ctrl+H</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="723"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>&amp;Print</source>
         <translation>&amp;Tlačiť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="734"/>
+        <location filename="../qt-ui/mainwindow.ui" line="791"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="742"/>
+        <location filename="../qt-ui/mainwindow.ui" line="799"/>
         <source>&amp;Quit</source>
         <translation>&amp;Ukončiť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="753"/>
+        <location filename="../qt-ui/mainwindow.ui" line="810"/>
         <source>Import from &amp;dive computer</source>
         <translation>Import z &amp;počítača</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="818"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation>Import &amp;GPS dát zo Subsurface služby</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="764"/>
+        <location filename="../qt-ui/mainwindow.ui" line="821"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="826"/>
         <source>&amp;Edit Device Names</source>
         <translation>&amp;Edituj názov zariadenia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="834"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="782"/>
+        <location filename="../qt-ui/mainwindow.ui" line="839"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Prečisluj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="785"/>
+        <location filename="../qt-ui/mainwindow.ui" line="842"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="798"/>
+        <location filename="../qt-ui/mainwindow.ui" line="855"/>
         <source>&amp;Yearly Statistics</source>
         <translation>&amp;Ročná štatistika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="801"/>
+        <location filename="../qt-ui/mainwindow.ui" line="858"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="806"/>
-        <source>Dive List</source>
-        <translation>Zoznam ponorov</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="814"/>
-        <source>Profile</source>
-        <translation>Profil</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="822"/>
-        <source>Info</source>
-        <translation>Info</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="830"/>
-        <source>All</source>
-        <translation>Všetko</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="872"/>
+        <location filename="../qt-ui/mainwindow.ui" line="929"/>
         <source>User &amp;Manual</source>
         <translation>Užívateľský &amp;Manual</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="880"/>
-        <source>Globe</source>
-        <translation>Zemeguľa</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="888"/>
+        <location filename="../qt-ui/mainwindow.ui" line="945"/>
         <source>P&amp;lan Dive</source>
         <translation>P&amp;lanuj ponor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="891"/>
+        <location filename="../qt-ui/mainwindow.ui" line="948"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="907"/>
-        <source>Import from Divelogs.de</source>
-        <translation>Import z Divelogs.de</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1003"/>
         <source>&amp;Check for Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="951"/>
-        <source>Export CSV</source>
-        <translation>Exportovať CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="726"/>
+        <location filename="../qt-ui/mainwindow.ui" line="783"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</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>Povoliť pO2 graf</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>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="316"/>
         <source>Enable MOD</source>
         <translation>Povoliť MOD</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>Zobraziť strop podľa DC</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>Zobraziť vypočítaný strop</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>Zobraziť vypočítaný strop v 3m krokoch</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>Zrátať všetky tkanivá</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>Zobraziť SAC</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>Povoliť/Zakázať pravítko</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="731"/>
-        <source>Preferences</source>
-        <translation>Nastavenia</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="745"/>
+        <location filename="../qt-ui/mainwindow.ui" line="802"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="756"/>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="774"/>
-        <source>Add Dive</source>
-        <translation>Pridaj ponor</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="793"/>
-        <source>Auto Group</source>
-        <translation>Automatické zgrupovanie</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="809"/>
+        <location filename="../qt-ui/mainwindow.ui" line="866"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="817"/>
+        <location filename="../qt-ui/mainwindow.ui" line="874"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <location filename="../qt-ui/mainwindow.ui" line="882"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="833"/>
+        <location filename="../qt-ui/mainwindow.ui" line="890"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="838"/>
-        <source>Prev DC</source>
-        <translation>Predchádzajúci DC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="841"/>
+        <location filename="../qt-ui/mainwindow.ui" line="898"/>
         <source>Left</source>
         <translation>Šipka v ľavo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="846"/>
-        <source>Next DC</source>
-        <translation>Nasledujúci DC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="849"/>
+        <location filename="../qt-ui/mainwindow.ui" line="906"/>
         <source>Right</source>
         <translation>Šipka v pravo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="854"/>
-        <source>Select Events</source>
-        <translation>Voľba udalosti</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <location filename="../qt-ui/mainwindow.ui" line="916"/>
         <source>Input Plan</source>
         <translation>Plánovanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="864"/>
-        <source>About Subsurface</source>
-        <translation>O Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="875"/>
+        <location filename="../qt-ui/mainwindow.ui" line="932"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="883"/>
+        <location filename="../qt-ui/mainwindow.ui" line="940"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="896"/>
-        <source>Import Log Files</source>
-        <translation>Import log súborov</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="899"/>
+        <location filename="../qt-ui/mainwindow.ui" line="956"/>
         <source>Import divelog files from other applications</source>
         <translation>Import log súborov z iných aplikácii</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="915"/>
+        <location filename="../qt-ui/mainwindow.ui" line="964"/>
+        <source>Import &amp;from Divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="972"/>
         <source>&amp;Full Screen</source>
         <translation>&amp;Celá obrazovka</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>Prepnúť celú obrazovku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <location filename="../qt-ui/mainwindow.ui" line="978"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="174"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
         <source>Open File</source>
         <translation>Otvoriť súbor</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>Ulož alebo zruš aktuálne editovanie ponoru pred zatvorením súboru.</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>
-        <translation>Ulož alebo zruš aktuálne editovanie ponoru pred plánovanim ponoru.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="396"/>
+        <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>Ulož alebo zruš aktuálne editovanie ponoru pred pridaním nového ponoru.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="645"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="419"/>
+        <source>Print runtime table</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="710"/>
         <source>Do you want to save the changes you made in the file %1?</source>
         <translation>Chceš uložiť zmeny prevedené v súbore %1?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="647"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="712"/>
         <source>Do you want to save the changes you made in the datafile?</source>
         <translation>Chces uložiť zmeny prevedené v dátovom súbore?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="652"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="717"/>
         <source>Save Changes?</source>
         <translation>Uložiť zmeny?</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>Zmeny budu stratené ak ich neuložíš.</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>Uložiť súbor ako</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>Upozornenie</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>Ulož alebo zruš aktuálne editovanie ponoru pred otvorením nového súboru.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="280"/>
-        <source>Export UDDF File as</source>
-        <translation>Exportovať UDDF súbor ako</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="281"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>UDDF súbory (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="289"/>
-        <source>Export CSV File as</source>
-        <translation>Exportovať CSV súbor ako</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="290"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>CSV súbory (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="299"/>
-        <source>Export World Map</source>
-        <translation>Exportuj World Map</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="300"/>
-        <source>HTML files (*.html)</source>
-        <translation>HTML súbory (*.html)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="449"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="514"/>
         <source>Yearly Statistics</source>
         <translation>Ročná štatistika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="961"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1076"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML súbory (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1199"/>
         <source>Open Dive Log File</source>
         <translation>Otvoriť log súbor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <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>Log súbory (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML súbory (*.xml);;UDDF/UDCF súbory(*.uddf *.udcf);;JDiveLog súbory(*.jlb);;Suunto súbory(*.sde *.db);;CSV súbory(*.csv);;Všetky súbory(*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1225"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Ukonči aktuálne editovanie pred tým než začneš ďalšie.</translation>
     </message>
 </context>
 <context>
+    <name>PlannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Last stop at 20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="416"/>
+        <source>Last stop at 6m</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>PreferencesDialog</name>
     <message>
         <location filename="../qt-ui/preferences.ui" line="85"/>
@@ -1825,247 +1928,297 @@ Vymaž ich prosím.</translation>
         <translation>Jazyk</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="151"/>
         <source>Lists and Tables</source>
         <translation>Zoznamy a tabuľky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="167"/>
         <source>Font size</source>
         <translation>Veľkosť fontu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="170"/>
+        <location filename="../qt-ui/preferences.ui" line="180"/>
         <source>Dives</source>
         <translation>Ponory</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>Predvolený súbor s ponormi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="188"/>
+        <location filename="../qt-ui/preferences.ui" line="198"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="197"/>
+        <location filename="../qt-ui/preferences.ui" line="207"/>
         <source>Display Invalid</source>
         <translation>Zobraz neplatné</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="214"/>
+        <location filename="../qt-ui/preferences.ui" line="224"/>
         <source>Default Cylinder</source>
         <translation>Predvolená fľaša</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>Použi prednastavenú fľašu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <location filename="../qt-ui/preferences.ui" line="247"/>
         <source>Animations</source>
         <translation>Animácie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <location filename="../qt-ui/preferences.ui" line="253"/>
         <source>Speed</source>
         <translation>Rýchlosť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="270"/>
+        <location filename="../qt-ui/preferences.ui" line="280"/>
         <source>Subsurface Webservice</source>
         <translation>Subsurface Webservice</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>Predvolené užívateľské ID</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>Uložiť uživateľské ID lokálne?</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="312"/>
+        <source>Reset all settings to their default value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
         <source>System</source>
         <translation>Systém</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="348"/>
         <source>Metric</source>
         <translation>Metrický</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="333"/>
+        <location filename="../qt-ui/preferences.ui" line="358"/>
         <source>Imperial</source>
         <translation>Imperiálny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="343"/>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
         <source>Personalize</source>
         <translation>Personalizácia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="392"/>
         <source>Depth</source>
         <translation>Hĺbka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="374"/>
+        <location filename="../qt-ui/preferences.ui" line="399"/>
         <source>meter</source>
         <translation>meter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="409"/>
         <source>feet</source>
         <translation>stopa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="401"/>
+        <location filename="../qt-ui/preferences.ui" line="426"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="411"/>
+        <location filename="../qt-ui/preferences.ui" line="436"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="428"/>
+        <location filename="../qt-ui/preferences.ui" line="453"/>
         <source>liter</source>
         <translation>liter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="438"/>
+        <location filename="../qt-ui/preferences.ui" line="463"/>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="455"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="465"/>
+        <location filename="../qt-ui/preferences.ui" line="490"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="482"/>
+        <location filename="../qt-ui/preferences.ui" line="507"/>
         <source>kg</source>
         <translation>kg</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>hranica pre zobrazenie pO₂</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>hranica pre zobrazenie pN₂</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>hranica pre zobrazenie pHe</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="636"/>
-        <source>max ppO₂ when showing MOD</source>
-        <translation>max ppO₂ pri zobrazení MOD</translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="811"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="817"/>
+        <source>Proxy type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="830"/>
+        <source>Host</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="856"/>
+        <source>Port</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="882"/>
+        <source>Requires authentication</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="925"/>
+        <source>Password</source>
+        <translation>Heslo</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>strop určený počítačom zobraziť červenou</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="747"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>System Default</source>
         <translation>Systémove prednastavenia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="767"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="419"/>
         <source>Pressure</source>
         <translation>Tlak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="421"/>
+        <location filename="../qt-ui/preferences.ui" line="446"/>
         <source>Volume</source>
         <translation>Objem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="448"/>
+        <location filename="../qt-ui/preferences.ui" line="473"/>
         <source>Temperature</source>
         <translation>Teplota</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="475"/>
+        <location filename="../qt-ui/preferences.ui" line="500"/>
         <source>Weight</source>
         <translation>Hmotnosť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="517"/>
         <source>lbs</source>
         <translation>US libra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="507"/>
+        <location filename="../qt-ui/preferences.ui" line="532"/>
         <source>Time units</source>
         <translation>Časové jednotky</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="520"/>
+        <location filename="../qt-ui/preferences.ui" line="545"/>
         <source>Minutes</source>
         <translation>Minuty</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="530"/>
+        <location filename="../qt-ui/preferences.ui" line="555"/>
         <source>Seconds</source>
         <translation>Sekundy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="562"/>
+        <location filename="../qt-ui/preferences.ui" line="587"/>
         <source>Show</source>
         <translation>Zobraz</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="693"/>
         <source>Show non-used cylinders in Equipment Tab</source>
         <translation>Zobraziť nepoužité fľaše v záložke výstroja</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="679"/>
+        <location filename="../qt-ui/preferences.ui" line="704"/>
         <source>show average depth</source>
         <translation>zobraziť priemernú hlbku</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>GFLow na max. hĺbke</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="691"/>
+        <location filename="../qt-ui/preferences.ui" line="716"/>
         <source>Misc</source>
         <translation>Rôzne</translation>
     </message>
@@ -2075,35 +2228,65 @@ Vymaž ich prosím.</translation>
         <translation>Nastavenia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="697"/>
+        <location filename="../qt-ui/preferences.ui" line="722"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="739"/>
         <source>GFHigh</source>
         <translation>GFHigh</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="24"/>
+        <source>System proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="25"/>
+        <source>HTTP proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="26"/>
+        <source>SOCKS proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="245"/>
         <source>Restart required</source>
         <translation>Potrebný reštart</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>Na korektné nahratie nového jazyka je potrebné reštartovať Subsurface.</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>Otvor predvolený Log súbor</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>Subsurface XML súbory (*.ssrf *.xml *.XML)</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="394"/>
+        <source>Warning</source>
+        <translation>Upozornenie</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"/>
+    </message>
 </context>
 <context>
     <name>PrintDialog</name>
@@ -2244,72 +2427,72 @@ Vymaž ich prosím.</translation>
 <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>neznámy</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>Ponor #%1 - %2</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>Max hĺbka: %1 %2</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>Trvanie: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1918"/>
+        <location filename="../qt-ui/models.cpp" line="1898"/>
         <source>Gas Used:</source>
         <translation>Použitá zmes:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1920"/>
+        <location filename="../qt-ui/models.cpp" line="1900"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1922"/>
+        <location filename="../qt-ui/models.cpp" line="1902"/>
         <source>Max. CNS:</source>
         <translation>Max. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1924"/>
+        <location filename="../qt-ui/models.cpp" line="1904"/>
         <source>Weights:</source>
         <translation>Závažia:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1929"/>
+        <location filename="../qt-ui/models.cpp" line="1909"/>
         <source>Notes:</source>
         <translation>Poznámky:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1936"/>
+        <location filename="../qt-ui/models.cpp" line="1916"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1938"/>
+        <location filename="../qt-ui/models.cpp" line="1918"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1940"/>
+        <location filename="../qt-ui/models.cpp" line="1920"/>
         <source>Suit:</source>
         <translation>Oblek:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1942"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>Viz:</source>
         <translation>Viď:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1944"/>
+        <location filename="../qt-ui/models.cpp" line="1924"/>
         <source>Rating:</source>
         <translation>Hodnotenie:</translation>
     </message>
@@ -2317,62 +2500,77 @@ Vymaž ich prosím.</translation>
 <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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/>
+        <source>Make first divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="906"/>
+        <source>Delete this divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="913"/>
         <source>Add Gas Change</source>
         <translation>Pridaj zmenu zmesi</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>Pridať Bookmark</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>Vymaž udalosť</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>Schovaj podobné udalosti</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>Editovať meno</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>Zobraziť všetky udalosti</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>Schovaj udalosti</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>Schovať všetky %1 udalosti?</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>Zmazať vybrané udalosti?</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>%1 @ %2:%3</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>Editovať meno záložky</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"/>
     </message>
@@ -2380,12 +2578,12 @@ Vymaž ich prosím.</translation>
 <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>Vzduch</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>Odstrániť tento bod</translation>
     </message>
@@ -2395,22 +2593,22 @@ Vymaž ich prosím.</translation>
         <translation>Zatvoriť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="34"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation>Priemer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="37"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="40"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation>Maximum</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>Posuň mapu a dvojklikom označ miesto ponoru</translation>
     </message>
@@ -2424,9 +2622,23 @@ Vymaž ich prosím.</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="128"/>
         <source>New starting number</source>
         <translation>Nové začiatočné číslo</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="126"/>
+        <source>New number</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchBar</name>
+    <message>
+        <location filename="../qt-ui/searchbar.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ShiftImageTimesDialog</name>
@@ -2441,42 +2653,47 @@ Vymaž ich prosím.</translation>
         <translation>Posunúť čas fotiek o</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="102"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="95"/>
+        <source>h:mm</source>
+        <translation>h:mm</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="105"/>
         <source>earlier</source>
         <translation>skôr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="109"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="112"/>
         <source>later</source>
         <translation>neskôr</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>Na výpočet časového posunu medzi počítačom a fotoaparátom odfoť svoj počítač keď zobrazuje čas. Nahraj fotku do počítača a stlač toto tlačítko.</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>Urči časový posun fotoaparáta</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>Vyber fotku počítača zobrazujúci čas</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>Aký dátum a čas je zobrazený na fotke?</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>Otvoriť fotku</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>Graficke súbory (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2556,42 +2773,42 @@ Vymaž ich prosím.</translation>
 <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>Webservis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/>
         <source>Connecting...</source>
         <translation>Pripájam...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="421"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="419"/>
         <source>Download finished</source>
         <translation>Sťahovanie ukončené</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>Chyba sťahovania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/>
         <source>Connection Error: </source>
         <translation>Chyba spojenia</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>Neplatný identifikátor užívateľa!</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>Nemôžem spracovať odpoveď!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/>
         <source>Download Success!</source>
         <translation>Nahrávanie úspešne ukončené!</translation>
     </message>
@@ -2607,17 +2824,17 @@ Vymaž ich prosím.</translation>
 <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>Popis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2625,7 +2842,7 @@ Vymaž ich prosím.</translation>
 <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>Informácie</translation>
     </message>
@@ -2633,42 +2850,42 @@ Vymaž ich prosím.</translation>
 <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"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="37"/>
-        <source>&lt;h3&gt;Subsurface was unable to check for updates.&lt;/h3&gt;</source>
+        <location filename="../qt-ui/updatemanager.cpp" line="36"/>
+        <source>Subsurface was unable to check for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
-        <source>&lt;br/&gt;&lt;b&gt;The following error occurred:&lt;/b&gt;&lt;br/&gt;</source>
-        <translation>&lt;br/&gt;&lt;b&gt;Vyskytli sa nasledujúce chyby:&lt;/b&gt;&lt;br/&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="41"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="43"/>
-        <source>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Please check your internet connection.&lt;/b&gt;</source>
-        <translation>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Prosím, skontroluj pripojenie na internet.&lt;/b&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
     </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>Používaš poslednu verziu Subsurface.</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>Nová verzia Subsurface je k dispozícii.&lt;br/&gt;Klikni na:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt;.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="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>&lt;b&gt;Nová verzia Subsurface je k dispozícii.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</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"/>
     </message>
@@ -2676,25 +2893,163 @@ Vymaž ich prosím.</translation>
 <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>Užívateľská príručka</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>Neviem nájsť manuál</translation>
     </message>
 </context>
 <context>
+    <name>UserSurvey</name>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="47"/>
+        <source>Subsurface User Survey</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="79"/>
+        <source>Recreational DIver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="92"/>
+        <source>Tech Diver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="105"/>
+        <source>Interested in dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="118"/>
+        <source>I am downloading dives from supported dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="131"/>
+        <source>I am importing dives from other software / sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="144"/>
+        <source>I am manually entering dives</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="190"/>
+        <source>Please type suggestions (in English) in the following box</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="27"/>
+        <source>
+Operating System: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="30"/>
+        <source>
+CPU Architecture: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="35"/>
+        <source>
+OS CPU Architecture %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="39"/>
+        <source>
+Language: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="73"/>
+        <source>Should we ask you later?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="74"/>
+        <source>Don&apos;t ask me again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="75"/>
+        <source>Ask Later</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="76"/>
+        <source>Ask again?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <source>Submit User Survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <source>Subsurface was unable to submit the user survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="101"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="102"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="111"/>
+        <source>Survey successfully submitted.</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </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>Popis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="723"/>
+        <location filename="../qt-ui/models.cpp" line="721"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2742,12 +3097,12 @@ Vymaž ich prosím.</translation>
         <translation>Nahratie</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>Čas operácie vypršal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="279"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="277"/>
         <source>Transfering data...</source>
         <translation>Prenášanie dát...</translation>
     </message>
@@ -2755,37 +3110,37 @@ Vymaž ich prosím.</translation>
 <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>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="368"/>
+        <location filename="../qt-ui/models.cpp" line="373"/>
         <source>Weight</source>
         <translation>Hmotnosť</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>Kliknutim sem vymažeš záťažový systém.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="453"/>
+        <location filename="../qt-ui/models.cpp" line="458"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="454"/>
+        <location filename="../qt-ui/models.cpp" line="459"/>
         <source>lbs</source>
         <translation>US libra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="478"/>
+        <location filename="../qt-ui/models.cpp" line="483"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="484"/>
         <source>m</source>
         <translation>m</translation>
     </message>
@@ -2793,76 +3148,76 @@ Vymaž ich prosím.</translation>
 <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>Rok 
  &gt; Mesiac / Akcia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1643"/>
         <source>Duration 
  Total</source>
         <translation>Trvanie
 Celkové</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>
 Average</source>
         <translation>Priemer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>
 Shortest</source>
         <translation>Najkratší</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>
 Longest</source>
         <translation>Najdlhší</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>Hĺbka (%1)
  Priemer</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>
 Minimum</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>
 Maximum</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>SAC (%1)
  Priemer</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>Temp. (%1)
@@ -2872,99 +3227,92 @@ Maximum</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="58"/>
+        <location filename="../dive.c" line="87"/>
         <source>pascal</source>
         <translation>pascal</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>bar</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>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="104"/>
-        <location filename="../qt-gui.cpp" line="292"/>
-        <source>l</source>
-        <translation>l</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>cuft</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>m</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>ft</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>US libra</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>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1120"/>
+        <location filename="../dive.c" line="1237"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) alebo (%s)</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>vzduch</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="170"/>
+        <location filename="../equipment.c" line="210"/>
         <source>integrated</source>
         <translation>integrované</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="171"/>
+        <location filename="../equipment.c" line="211"/>
         <source>belt</source>
         <translation>opasok</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="172"/>
+        <location filename="../equipment.c" line="212"/>
         <source>ankle</source>
         <translation>členok</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="173"/>
+        <location filename="../equipment.c" line="213"/>
         <source>backplate weight</source>
         <translation>backplate závažie</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="174"/>
+        <location filename="../equipment.c" line="214"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -2981,253 +3329,253 @@ Maximum</translation>
         <translation>Maximálny počet podporovaných stĺpcov pre CSV import je %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>none</source>
         <translation>žiaden</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>deco stop</source>
         <translation>dekompresná zastávka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ascent</source>
         <translation>výstup</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ceiling</source>
         <translation>strop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>workload</source>
         <translation>záťaž</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>transmitter</source>
         <translation>vysielač</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>violation</source>
         <translation>prekročenie</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>bookmark</source>
         <translation>poznámka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>surface</source>
         <translation>povrch</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>safety stop</source>
         <translation>bezpečnostná zastávka</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>zmena plynu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (voluntary)</source>
         <translation>bezpečnostná zastávka (dobrovoľná)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (mandatory)</source>
         <translation>bezpečnostná zastávka (povinná)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>deepstop</source>
         <translation>hĺbková zastávka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>ceiling (safety stop)</source>
         <translation>strop (bezpečnostná zastávka)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>divetime</source>
         <translation>čas ponoru</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>pod stropom</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>maxdepth</source>
         <translation>max. hĺbka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>airtime</source>
         <translation>čas na vzduchu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>heading</source>
         <translation>smer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>tissue level warning</source>
         <translation>upozornenie nasýtenia tkanív</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>non stop time</source>
         <translation>non stop čas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="163"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>invalid event number</source>
         <translation>neplatné číslo udalosti</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>Nie je možné spracovať %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="411"/>
+        <location filename="../libdivecomputer.c" line="414"/>
         <source>Error registering the data</source>
         <translation>Chyba registrácie dát</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="419"/>
+        <location filename="../libdivecomputer.c" line="422"/>
         <source>Error parsing the datetime</source>
         <translation>Chyba spracovania času</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="438"/>
         <source>Dive %d: %s %d %04d</source>
         <translation>Ponor #%d: %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="440"/>
+        <location filename="../libdivecomputer.c" line="443"/>
         <source>Error parsing the divetime</source>
         <translation>Chyba spracovania času ponoru</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="449"/>
+        <location filename="../libdivecomputer.c" line="452"/>
         <source>Error parsing the maxdepth</source>
         <translation>Chyba spracovania maximálnej hĺbky</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="458"/>
+        <location filename="../libdivecomputer.c" line="461"/>
         <source>Error parsing the gas mix count</source>
         <translation>Chyba spracovania dýchacích zmesí</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="470"/>
+        <location filename="../libdivecomputer.c" line="473"/>
         <source>Error obtaining water salinity</source>
         <translation>Chyba získania slanosti vody</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error obtaining surface pressure</source>
         <translation>Chyba pri zisťovaní tlaku na povrchu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the gas mix</source>
         <translation>Chyba spracovania zmesi plynu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="493"/>
+        <location filename="../libdivecomputer.c" line="496"/>
         <source>Error parsing the samples</source>
         <translation>Chyba spracovania vzoriek</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="623"/>
+        <location filename="../libdivecomputer.c" line="626"/>
         <source>Event: waiting for user action</source>
         <translation>Udalosť: Čakanie na vstup uživateľa</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>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="691"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the event handler.</source>
         <translation>Chyba registrácia správcu udalosti.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="696"/>
+        <location filename="../libdivecomputer.c" line="699"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Chyba registrácie správcu ukončenia</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="717"/>
+        <location filename="../libdivecomputer.c" line="720"/>
         <source>Dive data import error</source>
         <translation>Chyba importu dát</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="756"/>
+        <location filename="../libdivecomputer.c" line="759"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Problém inicializácie libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="763"/>
+        <location filename="../libdivecomputer.c" line="766"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Nie je možné otvoriť %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="462"/>
+        <location filename="../parse-xml.c" line="466"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Zvláštne percenta v %s
 </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>Chyba pri spracovaní &apos;%s&apos;</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>Neúspešná požiadavka: get_events.⏎
 </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>Databázová požiadavka get_tags zlýhala.
@@ -3241,111 +3589,160 @@ Maximum</translation>
 </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 '%s'.
 </source>
         <translation>Požiadavka na databázu zlyhala &apos;%s&apos;.
 </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>Databázová požiadavka get_cylinders zlýhala.
 </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>Databázová požiadavka get_changes zlyhala.
 </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>Databázová požiadavka get_profile_sample zlyhala.
 </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>Neviem otvoriť šablónu </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>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="146"/>
-        <location filename="../planner.c" line="617"/>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation>Neviem nájsť zmes %d/%d</translation>
+        <location filename="../planner.c" line="159"/>
+        <location filename="../planner.c" line="752"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="308"/>
+        <location filename="../planner.c" line="345"/>
         <source>Too many gas mixes</source>
         <translation>Príliš veľa zmesí</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="489"/>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation>%s
-Subsurface plan ponoru
-zrátaný s GFlow = %.0f a GFhigh = %.0f
-
-</translation>
+        <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>VAROVANIE: TOTO JE NOVÁ IMPLEMENTÁCIA BUHLMANOVHO ALGORITMU A NA ŇOM IMPLEMENTOVANÝ PLÁNOVAČ PONOROV, KTORÝ VŠAK BOL MINIMÁLNE TESTOVANÝ. V ŽIADNOM PRÍPADE SA NEDOPORUČUJE PLÁNOVAŤ SKUTOČNÉ PONORY LEN POMOCOU TOHTO PROGRAMU.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="530"/>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Prechod na %.*f %s v %d:%02d min - runtime %d:%02u na %s
-</translation>
+        <location filename="../planner.c" line="535"/>
+        <source>based on GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="539"/>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Zostaň v %.*f %s na %d:%02d min - runtime %d:%02u na %s
-</translation>
+        <location filename="../planner.c" line="538"/>
+        <source>Subsurface dive plan</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="550"/>
-        <source>Switch gas to %s
-</source>
-        <translation>Zmena plynu na %s
-</translation>
+        <location filename="../planner.c" line="542"/>
+        <source>depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="558"/>
-        <source>Gas consumption:
-</source>
-        <translation>Spotreba plynu:
-</translation>
+        <location filename="../planner.c" line="545"/>
+        <source>runtime</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="569"/>
-        <source>%.0f%s of %s
-</source>
-        <translation>%.0f%s z %s
-</translation>
+        <location filename="../planner.c" line="548"/>
+        <source>duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="551"/>
+        <source>gas</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </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"/>
     </message>
     <message>
-        <location filename="../planner.c" line="810"/>
+        <location filename="../planner.c" line="606"/>
+        <source>%3.0f%s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
+        <source>%3dmin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="629"/>
+        <source>Switch gas to %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="638"/>
+        <source>Gas consumption:</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="659"/>
+        <source>this is more gas than available in the specified cylinder!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="664"/>
+        <source>not enough reserve for gas sharing on ascent!</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="668"/>
+        <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="980"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1226"/>
+        <location filename="../profile.c" line="1250"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3354,70 +3751,69 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1229"/>
+        <location filename="../profile.c" line="1253"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1233"/>
+        <location filename="../profile.c" line="1257"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1263"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </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>SAC: %2.1fl/min
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1244"/>
+        <location filename="../profile.c" line="1268"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1246"/>
+        <location filename="../profile.c" line="1270"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1272"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="1274"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="1277"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1260"/>
+        <location filename="../profile.c" line="1284"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3426,7 +3822,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1264"/>
+        <location filename="../profile.c" line="1288"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3435,398 +3831,391 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1276"/>
+        <location filename="../profile.c" line="1300"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Bezpečnostná zastávka: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1279"/>
+        <location filename="../profile.c" line="1303"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Bezpečnostná zastávka: neznáma @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="1308"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
+        <location filename="../profile.c" line="1311"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: neznáma @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1291"/>
+        <location filename="../profile.c" line="1315"/>
         <source>In deco
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1293"/>
+        <location filename="../profile.c" line="1317"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1297"/>
+        <location filename="../profile.c" line="1321"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1305"/>
+        <location filename="../profile.c" line="1329"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1307"/>
+        <location filename="../profile.c" line="1331"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1310"/>
+        <location filename="../profile.c" line="1334"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1313"/>
+        <location filename="../profile.c" line="1337"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Vypočítaný strop %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1319"/>
+        <location filename="../profile.c" line="1343"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Tkanivo %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1325"/>
+        <location filename="../profile.c" line="1349"/>
         <source>heartbeat: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1327"/>
+        <location filename="../profile.c" line="1351"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1419"/>
+        <location filename="../profile.c" line="1443"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</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>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1435"/>
+        <location filename="../profile.c" line="1459"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1439"/>
+        <location filename="../profile.c" line="1463"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</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>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1454"/>
+        <location filename="../profile.c" line="1478"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="273"/>
+        <location filename="../qt-gui.cpp" line="281"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="276"/>
+        <location filename="../qt-gui.cpp" line="284"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="392"/>
-        <source>%1, %2 %3, %4 %5:%6</source>
-        <translation>%1, %2 %3, %4 %5:%6</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="405"/>
-        <source>%1 %2, %3
-%4:%5</source>
-        <translation>%1 %2, %3
-%4:%5</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="418"/>
+        <location filename="../qt-gui.cpp" line="417"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 ponorov)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="423"/>
+        <location filename="../qt-gui.cpp" line="422"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 ponor)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>boat</source>
         <translation>z lode</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>shore</source>
         <translation>z brehu</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>drift</source>
         <translation>prúdový</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>deep</source>
         <translation>hlboký</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>cavern</source>
         <translation>dutina</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>ice</source>
         <translation>ľad</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>wreck</source>
         <translation>vrak</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>cave</source>
         <translation>jaskyňa</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>altitude</source>
         <translation>výškovy</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>pool</source>
         <translation>bazén</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>lake</source>
         <translation>jazero</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>river</source>
         <translation>rieka</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>night</source>
         <translation>nočný</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>fresh</source>
         <translation>čerstvý</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>student</source>
         <translation>študent</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>photo</source>
         <translation>fotenie</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>video</source>
         <translation>kamera</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>instructor</source>
         <translation>inštruktor</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="25"/>
         <source>deco</source>
         <translation>deco</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="216"/>
+        <location filename="../dive.c" line="133"/>
+        <source>ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="214"/>
         <source>more than %d days</source>
         <translation>viac než %d dní</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="220"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="224"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="235"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation>pre ponory</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="242"/>
+        <location filename="../statistics.c" line="240"/>
         <source>for selected dives</source>
         <translation>pre vybrané ponory</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="275"/>
         <source>for dive #%d</source>
         <translation>pre ponor #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for selected dive</source>
         <translation>pre vybraný ponor</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for all dives</source>
         <translation>pre všetky ponory</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="283"/>
+        <location filename="../statistics.c" line="281"/>
         <source>(no dives)</source>
         <translation>(žiadné ponory)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sun</source>
         <translation>Ne</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Mon</source>
         <translation>Po</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Tue</source>
         <translation>Ut</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Wed</source>
         <translation>St</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Thu</source>
         <translation>Št</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Fri</source>
         <translation>Pi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sat</source>
         <translation>So</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>May</source>
         <translation>Máj</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Dec</source>
         <translation>Dec</translation>
     </message>
@@ -3856,97 +4245,97 @@ Is the Uemis Zurich plugged in correctly?</source>
 Je Uemis Zurich korektne pripojený?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="107"/>
+        <location filename="../uemis-downloader.c" line="111"/>
         <source>unknown</source>
         <translation>neznámy</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="379"/>
+        <location filename="../uemis-downloader.c" line="383"/>
         <source>Reading %s %s</source>
         <translation>Načítavam %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="399"/>
+        <location filename="../uemis-downloader.c" line="403"/>
         <source>data</source>
         <translation>data</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="420"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>divelog entry id</source>
         <translation>id položky logu</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="422"/>
+        <location filename="../uemis-downloader.c" line="426"/>
         <source>divespot data id</source>
         <translation>id dát miesta ponoru</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
+        <location filename="../uemis-downloader.c" line="428"/>
         <source>more data dive id</source>
         <translation>id ďalších dát ponoru</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>wetsuit</source>
         <translation>neoprén</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>semidry</source>
         <translation>polosuchý</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>drysuit</source>
         <translation>suchý oblek</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>shorty</source>
         <translation>krátky</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>vest</source>
         <translation>vesta</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>long john</source>
         <translation>long john</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>jacket</source>
         <translation>vesta</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>full suit</source>
         <translation>celotelový oblek</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>2 pcs full suit</source>
         <translation>2 dielny oblek</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="620"/>
+        <location filename="../uemis-downloader.c" line="624"/>
         <source>membrane</source>
         <translation>membrana</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="802"/>
+        <location filename="../uemis-downloader.c" line="823"/>
         <source>Init Communication</source>
         <translation>Inicializácia komunikácie</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="804"/>
+        <location filename="../uemis-downloader.c" line="825"/>
         <source>Uemis init failed</source>
         <translation>Uemis - inicializácia neúspešná</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="815"/>
+        <location filename="../uemis-downloader.c" line="836"/>
         <source>Start download</source>
         <translation>Začať nahrávanie</translation>
     </message>
@@ -3967,18 +4356,18 @@ Je Uemis Zurich korektne pripojený?</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="203"/>
-        <source>PO2 Green Warning</source>
-        <translation>PO2 Upozornenie: Zelená</translation>
+        <source>pO₂ Green Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
-        <source>PO2 Ascend Warning</source>
-        <translation>PO2 Upozornenie: Výstup</translation>
+        <source>pO₂ Ascend Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="208"/>
-        <source>PO2 Ascend Alarm</source>
-        <translation>PO2 Alarm: Výstup</translation>
+        <source>pO₂ Ascend Alarm</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
@@ -4040,5 +4429,214 @@ Je Uemis Zurich korektne pripojený?</translation>
         <source>Low Battery Alert</source>
         <translation>Alarm: Slabá batéria</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"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="36"/>
+        <source>Date:</source>
+        <translation>Dátum:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="38"/>
+        <source>Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="40"/>
+        <source>Duration:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="41"/>
+        <source>min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="43"/>
+        <source>Max Depth:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="46"/>
+        <source>Air Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="48"/>
+        <source>Water Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="50"/>
+        <source>Location:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="54"/>
+        <source>Notes:</source>
+        <translation>Poznámky:</translation>
+    </message>
+</context>
+<context>
+    <name>plannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="35"/>
+        <source>Rates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="56"/>
+        <source>Ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="77"/>
+        <source>below 75% avg. depth</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="94"/>
+        <source>75%-50% avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="111"/>
+        <source>50% avg. depth - 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="128"/>
+        <source>6m/20ft to surface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="148"/>
+        <source>Descent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="200"/>
+        <source>surface to the bottom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="226"/>
+        <source>Planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="247"/>
+        <source>GF low</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="264"/>
+        <source>GF high</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
+        <source>Drop to first depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
+        <source>Last Stop at 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>plan backgas breaks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="318"/>
+        <source>Gas Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <source>bottom SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="349"/>
+        <source>deco SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="359"/>
+        <source>bottom pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="389"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="382"/>
+        <source>deco pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="421"/>
+        <source>Dive Notes</source>
+        <translation>Poznámky</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="445"/>
+        <source>display runtime</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="458"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="461"/>
+        <source>display segment duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="471"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="474"/>
+        <source>display transitions in deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="481"/>
+        <source>verbatim diveplan</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_sv_SE.ts b/translations/subsurface_sv_SE.ts
index 38cdde6d9..eee515ba2 100644
--- a/translations/subsurface_sv_SE.ts
+++ b/translations/subsurface_sv_SE.ts
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="sv_SE">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="sv_SE" version="2.0">
+<defaultcodec>UTF-8</defaultcodec>
 <context>
     <name>CylindersModel</name>
     <message>
@@ -39,42 +38,42 @@
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="71"/>
+        <location filename="../qt-ui/models.cpp" line="70"/>
         <source>Switch at</source>
         <translation>Byt vid</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>Klicka här för att ta bort denna flaska</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>Flaska kan inte tas bort</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>Denna gas används. Bara flaskor som inte används kan tas bort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="507"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="508"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="527"/>
+        <location filename="../qt-ui/models.cpp" line="532"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="528"/>
+        <location filename="../qt-ui/models.cpp" line="533"/>
         <source>cuft</source>
         <translation>ft³</translation>
     </message>
@@ -102,22 +101,22 @@ radera den valda dykdatorn?</translation>
 <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>Modell</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Device ID</source>
         <translation>Enhetsid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Nickname</source>
         <translation>Enhetsnamn</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>Klicka här för att ta bort denna dykdator</translation>
     </message>
@@ -125,190 +124,326 @@ radera den valda dykdatorn?</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="90"/>
-        <source>air</source>
-        <translation>luft</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="92"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</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>Bailout till öppet system</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>start</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>slut</translation>
     </message>
 </context>
 <context>
-    <name>DiveGasPressureItem</name>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="475"/>
-        <source>air</source>
-        <translation>luft</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="476"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-</context>
-<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1258"/>
-        <source> l/min</source>
-        <translation> l/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
-        <source> cuft/min</source>
-        <translation> cuft/min</translation>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <source>/min</source>
+        <translation>/min</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>Visa sökruta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="706"/>
         <source>expand all</source>
         <translation>Expandera alla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="740"/>
+        <location filename="../qt-ui/divelistview.cpp" line="707"/>
         <source>collapse all</source>
         <translation>Sammanslå alla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="741"/>
+        <location filename="../qt-ui/divelistview.cpp" line="708"/>
         <source>collapse others</source>
         <translation>kollapsa andra</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>ta bort dyk(en) från resan</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>skapa ny resa ovan</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>lägg till dyk(en) till resan direkt ovan</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>lägg till dyk(en) till resan direkt nedanför</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>sammanfoga resa med resan ovan</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>sammanfoga resa med resan nedan</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>radera dyk</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>Markera dyk som ogiltiga</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
-        <source>save As</source>
-        <translation>Spara som</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="763"/>
-        <source>export As UDDF</source>
-        <translation>Exportera som UDDF fil</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="764"/>
-        <source>export As CSV</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/divelistview.cpp" line="744"/>
+        <source>renumber dive(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="765"/>
+        <location filename="../qt-ui/divelistview.cpp" line="745"/>
         <source>shift times</source>
         <translation>skifta tider</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="766"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>load images</source>
         <translation>ladda bilder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="769"/>
-        <source>upload dive(s) to divelogs.de</source>
-        <translation>Ladda upp dyk till divelogs.de</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Open Image Files</source>
+        <translation>Öppna bildfler</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation>Bildfiler (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <source>merge selected dives</source>
+        <translation>Sammanslå dyk</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="24"/>
+        <source>General Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="30"/>
+        <source>Export format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="42"/>
+        <source>Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="61"/>
+        <source>UDDF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="74"/>
+        <source>divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="84"/>
+        <source>CSV</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="94"/>
+        <source>Worldmap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="107"/>
+        <source>Selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="116"/>
+        <source>Selected dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="126"/>
+        <source>All dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="178"/>
+        <source>HTML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="184"/>
+        <source>General Settings</source>
+        <translation>Allmänna Iinställningar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="190"/>
+        <source>Subsurface Numbers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="203"/>
+        <source>Selected Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="216"/>
+        <source>Minimum Javascript</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="229"/>
+        <source>All Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="239"/>
+        <source>Export List only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="252"/>
+        <source>Style Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="264"/>
+        <source>Font</source>
+        <translation>Font</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="274"/>
+        <source>Font size</source>
+        <translation>Fontstorlek</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
+        <source>8</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <source>10</source>
+        <translation>10</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <source>12</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <source>14</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <source>16</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <source>18</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <source>20</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="323"/>
+        <source>Theme</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="795"/>
-        <source>Save Dives As...</source>
-        <translation>Spara dyk som...</translation>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <source>Sand</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="814"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="153"/>
         <source>Export UDDF File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>UDDF filer (*.uddf *.UDDF)</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Open Image Files</source>
-        <translation>Öppna bildfler</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="162"/>
+        <source>Export World Map</source>
+        <translation>Expotera värdskarta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
-        <translation>Bildfiler (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="163"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="177"/>
+        <source>HTML files (*.html)</source>
+        <translation>HTMLfiler (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="760"/>
-        <source>merge selected dives</source>
-        <translation>Sammanslå dyk</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="167"/>
+        <source>Export Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="168"/>
+        <source>XML files (*.xml *.ssrf)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="176"/>
+        <source>Export HTML files as</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -319,138 +454,133 @@ radera den valda dykdatorn?</translation>
         <translation>Importera dyklogg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="36"/>
-        <source>Import CSV Dive Log Files</source>
-        <translation>Importera CSV dykloggar</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="50"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
         <source>CSV options</source>
         <translation>CSV-inställningar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="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>Fältavskiljare</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>Förkonfigurerade importer</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>Fältkonfiguration</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="80"/>
         <source>Depth</source>
         <translation>Djup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="100"/>
         <source>Stopdepth</source>
         <translation>Stoppdjup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="107"/>
         <source>PO2</source>
         <translation>PO2</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>Tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="121"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="151"/>
         <source>Cns</source>
         <translation>Cns</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>Enheter</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>Metrisk</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>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="248"/>
         <source>Manual dives</source>
         <translation>Manuella dykloggar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="283"/>
         <source>Dive #</source>
         <translation>Dyk #</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="317"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="385"/>
         <source>Duration</source>
         <translation>Varaktighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="470"/>
         <source>Tags</source>
         <translation>Taggar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
         <source>Location</source>
         <translation>Plats</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="453"/>
         <source>Gps</source>
         <translation>Gps</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="300"/>
         <source>Max depth</source>
         <translation>Maxdjup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="334"/>
         <source>Mean depth</source>
         <translation>Medeldjup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="368"/>
         <source>Buddy</source>
         <translation>Parkamrat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="402"/>
         <source>Notes</source>
         <translation>Anteckningar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="436"/>
         <source>Weight</source>
         <translation>Vikt</translation>
     </message>
@@ -458,105 +588,70 @@ radera den valda dykdatorn?</translation>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="71"/>
-        <source>Bottom SAC</source>
-        <translation>Botten SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="85"/>
-        <source>SAC on DECO Stop</source>
-        <translation>SAC på DEKOSTOP</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="78"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="98"/>
-        <source>GFLow</source>
-        <translation>GFLow</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="106"/>
+        <source>Planned Dive Time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="125"/>
-        <source>Last Stop at 6m</source>
-        <translation>Sista stoppet på 6m</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="134"/>
+        <source>Altitude</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="174"/>
-        <source>Start Time</source>
-        <translation>Starttid</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="181"/>
+        <location filename="../qt-ui/diveplanner.ui" line="141"/>
         <source>ATM Pressure</source>
         <translation>Atmosfärstryck</translation>
     </message>
-</context>
-<context>
-    <name>DivePlannerGraphics</name>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="114"/>
-        <source>10m</source>
-        <translation>10m</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="116"/>
-        <source>30ft</source>
-        <translation>30ft</translation>
-    </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="363"/>
-        <source>Handler Position Error</source>
-        <translation>Hantera possitionsfel</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="148"/>
+        <source>mbar</source>
+        <translation type="unfinished"/>
     </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>
-        <translation>Ett eller flera av dina stop försvinner med denna operation
-vänligen ta bort dessa först.</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="158"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="445"/>
-        <source>AIR</source>
-        <translation>LUFT</translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="137"/>
+        <source>unknown</source>
+        <translation>okänd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1148"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="586"/>
         <source>Final Depth</source>
         <translation>Slutdjup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1150"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="588"/>
         <source>Run time</source>
         <translation>Löptid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1152"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="590"/>
         <source>Duration</source>
         <translation>Varaktighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1154"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="592"/>
         <source>Used Gas</source>
         <translation>Använd gas</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>CC Set Point</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>Kassera plan?</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>Du kommer kassera din plan</translation>
     </message>
@@ -564,17 +659,17 @@ vänligen ta bort dessa först.</translation>
 <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>Dykplaneringspunkter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="256"/>
         <source>Available Gases</source>
         <translation>Tillgängliga gaser</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>lägg till dykdatapunkt</translation>
     </message>
@@ -618,8 +713,23 @@ vänligen ta bort dessa först.</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
-        <source>Pressure  S</source>
-        <translation>Tryck S</translation>
+        <source>Pressure S</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <source>pN₂</source>
+        <translation>pN₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>pHe</source>
+        <translation>pHe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
@@ -636,86 +746,71 @@ vänligen ta bort dessa först.</translation>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
-        <source>PN2</source>
-        <translation>PN2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
-        <source>PHE</source>
-        <translation>PHE</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
-        <source>PO2</source>
-        <translation>PO2</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>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>date</source>
         <translation>datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1298"/>
         <source>min</source>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>lbs</source>
         <translation>pund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
+        <location filename="../qt-ui/models.cpp" line="1307"/>
         <source>suit</source>
         <translation>dräkt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1310"/>
         <source>cyl</source>
         <translation>flaska</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1344"/>
+        <location filename="../qt-ui/models.cpp" line="1325"/>
         <source>location</source>
         <translation>plats</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1316"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1338"/>
+        <location filename="../qt-ui/models.cpp" line="1319"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1341"/>
+        <location filename="../qt-ui/models.cpp" line="1322"/>
         <source>maxCNS</source>
         <translation>maxCNS</translation>
     </message>
@@ -723,115 +818,115 @@ vänligen ta bort dessa först.</translation>
 <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>Ogiltigt svar från server</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>Förväntade XML tag &apos;DiveDateReader&apos; men fick istället &apos;%1</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>Förväntad XML tagg &apos;DiveDates&apos; gick ej att finna</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>Felformaterat XML svar. Rad %1: %2</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>inga dyk var markerade</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>misslyckades med att skapa zipfilen för uppladdning: %s</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>kunde inte skapa temporär fil: %s</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>internt fel: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="181"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="179"/>
         <source>internal error</source>
         <translation>internt fel</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>Klar</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>Laddar upp dyklista...</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>Laddar ner dyklista...</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>Laddar ner %1 dyk...</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>Nedladdning klar - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
         <source>Corrupted download</source>
         <translation>Misslyckad nedladdning</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>Arkivet kunde inte öppnas:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Upload failed</source>
         <translation>Uppladdning misslyckades</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="849"/>
         <source>Upload successful</source>
         <translation>Nedladdning lyckades</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="854"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="852"/>
         <source>Login failed</source>
         <translation>Inloggning misslyckades</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>Kan inte tolka respons</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="868"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Error: %1</source>
         <translation>Fel: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="835"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/>
         <source>Upload finished</source>
         <translation>Uppladdning klar</translation>
     </message>
@@ -839,54 +934,54 @@ vänligen ta bort dessa först.</translation>
 <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>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="165"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/>
         <source>Error</source>
         <translation>Error</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>Försök igen</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>Hitta Uemis dykdator</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>Välj fil som loggfil för nerladdningen ifrån dykdatorn</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>Loggfiler (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="339"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
         <source>Warning</source>
         <translation>Varning</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>Att spara en libdivecomputer-dump kommer inte att ladda ner dyken till dyklistan.</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>Välj fil för binär dumpning av nerladdningen ifrån dykdatorn</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>Dumpfiler (*.bin)</translation>
     </message>
@@ -954,7 +1049,7 @@ vänligen ta bort dessa först.</translation>
 <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>Ändra valda dykplatser</translation>
     </message>
@@ -963,848 +1058,854 @@ vänligen ta bort dessa först.</translation>
     <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>Dykanteckningar</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>Plats</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="148"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Coordinates</source>
         <translation>Koordinater</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="169"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="155"/>
+        <location filename="../qt-ui/maintab.ui" line="148"/>
         <source>Buddy</source>
         <translation>Parkamrat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="63"/>
-        <source>Start time</source>
-        <translation>Starttid</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>Lufttemp</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>Vattentemperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="127"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Tags</source>
         <translation>Taggar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="223"/>
         <source>Rating</source>
         <translation>Rankning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="236"/>
         <source>Visibility</source>
         <translation>Synlighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="215"/>
+        <location filename="../qt-ui/maintab.ui" line="127"/>
         <source>Suit</source>
         <translation>Dräkt</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>Anteckningar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="270"/>
+        <location filename="../qt-ui/maintab.ui" line="311"/>
         <source>Equipment</source>
         <translation>Utrustning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="350"/>
+        <location filename="../qt-ui/maintab.ui" line="391"/>
         <source>Dive Info</source>
         <translation>Information</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>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="414"/>
+        <location filename="../qt-ui/maintab.ui" line="275"/>
+        <source>Time</source>
+        <translation>Tid</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="455"/>
         <source>Interval</source>
         <translation>Intervall</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="433"/>
+        <location filename="../qt-ui/maintab.ui" line="474"/>
         <source>Gases Used</source>
         <translation>Gasanvändning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="452"/>
+        <location filename="../qt-ui/maintab.ui" line="493"/>
         <source>Gas Consumed</source>
         <translation>Gasanvändning</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>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="531"/>
         <source>Max. Depth</source>
         <translation>Maxdjup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="509"/>
+        <location filename="../qt-ui/maintab.ui" line="550"/>
         <source>Ave. Depth</source>
         <translation>Medeldjup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="528"/>
+        <location filename="../qt-ui/maintab.ui" line="569"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="547"/>
+        <location filename="../qt-ui/maintab.ui" line="588"/>
         <source>Air Pressure</source>
         <translation>Lufttryck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="566"/>
+        <location filename="../qt-ui/maintab.ui" line="607"/>
         <source>Air Temperature</source>
         <translation>Lufttemperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="585"/>
+        <location filename="../qt-ui/maintab.ui" line="626"/>
         <source>Water Temperature</source>
         <translation>Vattentemperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="604"/>
+        <location filename="../qt-ui/maintab.ui" line="645"/>
         <source>Dive Time</source>
         <translation>Dyktid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="623"/>
+        <location filename="../qt-ui/maintab.ui" line="664"/>
         <source>Salinity</source>
         <translation>Salthalt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="660"/>
+        <location filename="../qt-ui/maintab.ui" line="701"/>
         <source>Stats</source>
         <translation>Statistik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="746"/>
         <source>Depth</source>
         <translation>Djup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="784"/>
         <source>Duration</source>
         <translation>Varaktighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Total Time</source>
         <translation>Total tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="835"/>
         <source>Dives</source>
         <translation>Dyk</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="919"/>
+        <source>Photos</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="89"/>
         <source>Cylinders</source>
         <translation>Flaskor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="90"/>
         <source>Add Cylinder</source>
         <translation>Lägg till flaska</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="93"/>
         <source>Weights</source>
         <translation>Vikter</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>Lägg till Viktsystem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="438"/>
+        <location filename="../qt-ui/maintab.cpp" line="409"/>
         <source>Trip Location</source>
         <translation>Resmål</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>Reseanteckningar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="42"/>
+        <location filename="../qt-ui/maintab.cpp" line="48"/>
         <source>Save</source>
         <translation>Spara</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="46"/>
+        <location filename="../qt-ui/maintab.cpp" line="52"/>
         <source>Cancel</source>
         <translation>Avbryt</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>Lufttemperatur [%1]</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>Vattentemperatur [%1]</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>Detta resmål håller på och ändras.</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>Flera dyk håller på och ändras.</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>Detta dyk håller på och ändras.</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>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="494"/>
+        <location filename="../qt-ui/maintab.cpp" line="464"/>
         <source>unknown</source>
         <translation>okänd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>N</source>
-        <translation>N</translation>
+        <location filename="../qt-ui/maintab.cpp" line="501"/>
+        <source>Deepest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>S</source>
-        <translation>S</translation>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <source>Shallowest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>E</source>
-        <translation>E</translation>
+        <location filename="../qt-ui/maintab.cpp" line="794"/>
+        <source>Discard the Changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>W</source>
-        <translation>W</translation>
+        <location filename="../qt-ui/maintab.cpp" line="795"/>
+        <source>You are about to discard your changes.</source>
+        <translation type="unfinished"/>
     </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>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="571"/>
+        <location filename="../qt-ui/mainwindow.ui" line="646"/>
         <source>&amp;File</source>
         <translation>&amp;File</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="583"/>
+        <source>Print</source>
+        <translation>Skriv ut</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:'Courier'; 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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
         <source>&amp;Log</source>
         <translation>&amp;Logg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="606"/>
+        <location filename="../qt-ui/mainwindow.ui" line="679"/>
         <source>&amp;View</source>
         <translation>&amp;Visa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="628"/>
+        <location filename="../qt-ui/mainwindow.ui" line="701"/>
         <source>&amp;Help</source>
         <translation>&amp;Hjälp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="636"/>
+        <location filename="../qt-ui/mainwindow.ui" line="709"/>
         <source>&amp;Import</source>
         <translation>&amp;Import</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>&amp;Ny Loggbok</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="655"/>
+        <location filename="../qt-ui/mainwindow.ui" line="728"/>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="658"/>
+        <location filename="../qt-ui/mainwindow.ui" line="731"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</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>&amp;Öppna loggbok</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="666"/>
+        <location filename="../qt-ui/mainwindow.ui" line="739"/>
         <source>Open</source>
         <translation>Öppna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <location filename="../qt-ui/mainwindow.ui" line="742"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="674"/>
+        <location filename="../qt-ui/mainwindow.ui" line="747"/>
         <source>&amp;Save</source>
         <translation>&amp;Spara</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="677"/>
+        <location filename="../qt-ui/mainwindow.ui" line="750"/>
         <source>Save</source>
         <translation>Spara</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="680"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>Save as</source>
         <translation>Spara som</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>Ctrl+Shift+S</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>Stäng</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Close</source>
         <translation>Stäng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="702"/>
+        <location filename="../qt-ui/mainwindow.ui" line="775"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="902"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <source>P&amp;references</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="831"/>
+        <source>&amp;Add Dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <source>Auto &amp;Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="863"/>
+        <source>&amp;Dive List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="871"/>
+        <source>&amp;Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="879"/>
+        <source>&amp;Info</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="887"/>
+        <source>&amp;All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="895"/>
+        <source>P&amp;rev DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="903"/>
+        <source>&amp;Next DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="911"/>
+        <source>&amp;Select Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <source>&amp;About Subsurface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="937"/>
+        <source>&amp;Globe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="953"/>
+        <source>&amp;Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="959"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="707"/>
-        <source>Export &amp;UDDF</source>
-        <translation>Exportera &amp;UDDF</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="1008"/>
+        <source>&amp;Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1011"/>
+        <source>Export Dive Logs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1014"/>
+        <source>Ctrl+E</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Enable the pN2 Graph</source>
         <translation>Aktivera pN2 grafen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <location filename="../qt-ui/mainwindow.ui" line="128"/>
         <source>Enable the pHe graph</source>
         <translation>Aktivera pHe grafen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <location filename="../qt-ui/mainwindow.ui" line="290"/>
         <source>Show/hide heart rate</source>
         <translation>Visa/Dölj hjärtrytm</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <location filename="../qt-ui/mainwindow.ui" line="342"/>
         <source>Enable EAD, END, and EADD</source>
         <translation>Aktivera EAD, END och EADD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="238"/>
         <source>Show NDL / TTS</source>
         <translation>Visa NDL / TTS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="456"/>
+        <location filename="../qt-ui/mainwindow.ui" line="394"/>
         <source>Rescale depth axis</source>
         <translation>Skala om djupaxeln</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="710"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="715"/>
-        <source>Export HTML World Map</source>
-        <translation>Expotera HTML-värdskarta</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="718"/>
-        <source>Ctrl+H</source>
-        <translation>Ctrl+H</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="723"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>&amp;Print</source>
         <translation>&amp;Skriv ut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="734"/>
+        <location filename="../qt-ui/mainwindow.ui" line="791"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="742"/>
+        <location filename="../qt-ui/mainwindow.ui" line="799"/>
         <source>&amp;Quit</source>
         <translation>&amp;Avsluta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="753"/>
+        <location filename="../qt-ui/mainwindow.ui" line="810"/>
         <source>Import from &amp;dive computer</source>
         <translation>Ladda ner från dykdator</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="818"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation>Importera &amp;GPSdata från Subsurface webbtjänst</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="764"/>
+        <location filename="../qt-ui/mainwindow.ui" line="821"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="826"/>
         <source>&amp;Edit Device Names</source>
         <translation>&amp;Ändra Enhetsnamn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="834"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="782"/>
+        <location filename="../qt-ui/mainwindow.ui" line="839"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Renumrering</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="785"/>
+        <location filename="../qt-ui/mainwindow.ui" line="842"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="798"/>
+        <location filename="../qt-ui/mainwindow.ui" line="855"/>
         <source>&amp;Yearly Statistics</source>
         <translation>&amp;Årsstatistik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="801"/>
+        <location filename="../qt-ui/mainwindow.ui" line="858"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="806"/>
-        <source>Dive List</source>
-        <translation>Dyklista</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="814"/>
-        <source>Profile</source>
-        <translation>Profil</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="822"/>
-        <source>Info</source>
-        <translation>Info</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="830"/>
-        <source>All</source>
-        <translation>Alla</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="872"/>
+        <location filename="../qt-ui/mainwindow.ui" line="929"/>
         <source>User &amp;Manual</source>
         <translation>&amp;Användarmanual</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="880"/>
-        <source>Globe</source>
-        <translation>Glob</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="888"/>
+        <location filename="../qt-ui/mainwindow.ui" line="945"/>
         <source>P&amp;lan Dive</source>
         <translation>Pl&amp;anera Dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="891"/>
+        <location filename="../qt-ui/mainwindow.ui" line="948"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="907"/>
-        <source>Import from Divelogs.de</source>
-        <translation>Import från Divelogs.de</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="1003"/>
         <source>&amp;Check for Updates</source>
         <translation>&amp;Sök efter uppdateringar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="951"/>
-        <source>Export CSV</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="726"/>
+        <location filename="../qt-ui/mainwindow.ui" line="783"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</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>Aktivera pO2 grafen</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>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="316"/>
         <source>Enable MOD</source>
         <translation>Aktivera MOD</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>Visa dykdatorrapporterat takinformation</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>Visa beräknad takinformation</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>Visa beräknad takinformation i 3m steg</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>Visa alla vävnader</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>Visa SAC</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>Aktivera / Inaktivera mätstickan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="731"/>
-        <source>Preferences</source>
-        <translation>Inställningar</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="745"/>
+        <location filename="../qt-ui/mainwindow.ui" line="802"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="756"/>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="774"/>
-        <source>Add Dive</source>
-        <translation>Nytt dyk</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="793"/>
-        <source>Auto Group</source>
-        <translation>Autogruppering</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="809"/>
+        <location filename="../qt-ui/mainwindow.ui" line="866"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="817"/>
+        <location filename="../qt-ui/mainwindow.ui" line="874"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <location filename="../qt-ui/mainwindow.ui" line="882"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="833"/>
+        <location filename="../qt-ui/mainwindow.ui" line="890"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="838"/>
-        <source>Prev DC</source>
-        <translation>Föregående dykdator</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="841"/>
+        <location filename="../qt-ui/mainwindow.ui" line="898"/>
         <source>Left</source>
         <translation>Vänster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="846"/>
-        <source>Next DC</source>
-        <translation>Nästa dykdator</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="849"/>
+        <location filename="../qt-ui/mainwindow.ui" line="906"/>
         <source>Right</source>
         <translation>Höger</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="854"/>
-        <source>Select Events</source>
-        <translation>Välj händelser</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <location filename="../qt-ui/mainwindow.ui" line="916"/>
         <source>Input Plan</source>
         <translation>Skriv plan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="864"/>
-        <source>About Subsurface</source>
-        <translation>Om Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="875"/>
+        <location filename="../qt-ui/mainwindow.ui" line="932"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="883"/>
+        <location filename="../qt-ui/mainwindow.ui" line="940"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="896"/>
-        <source>Import Log Files</source>
-        <translation>Importera loggfiler</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="899"/>
+        <location filename="../qt-ui/mainwindow.ui" line="956"/>
         <source>Import divelog files from other applications</source>
         <translation>Importera loggfiler ifrån andra applikationer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="915"/>
+        <location filename="../qt-ui/mainwindow.ui" line="964"/>
+        <source>Import &amp;from Divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="972"/>
         <source>&amp;Full Screen</source>
         <translation>&amp;Fullskärm</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>Växla fullskärmsläge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <location filename="../qt-ui/mainwindow.ui" line="978"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="174"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
         <source>Open File</source>
         <translation>Öppna fil</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>Vänligen spara eller avbryt pågående ändring av dyk innan du stänger filen.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="330"/>
-        <source>Please save or cancel the current dive edit before trying to plan a dive.</source>
-        <translation>Vänligen spara eller avbryt pågående ändring av dyk innan du försöker planera ett dyk.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="396"/>
+        <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>Vänligen spara eller avbryt pågående ändring av dyk innan du försöker lägga till ett dyk.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="645"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="419"/>
+        <source>Print runtime table</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="710"/>
         <source>Do you want to save the changes you made in the file %1?</source>
         <translation>Vill du spara ändringarna gjorda i filen %1?</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>Vill du spara ändringarna gjorda i datafilen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="652"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="717"/>
         <source>Save Changes?</source>
         <translation>Spara ändringar?</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>Ändringar förloras om du inte sparar dom.</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>Spara fil som</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>Varning</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>Vänligen spara eller avbryt pågående ändring av dyk innan du försöker öppna en ny fil.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="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>UDDF filer (*.uddf *.UDDF)</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>
-        <translation>Expotera värdskarta</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="300"/>
-        <source>HTML files (*.html)</source>
-        <translation>HTMLfiler (*.html)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="449"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="514"/>
         <source>Yearly Statistics</source>
         <translation>Årsstatistik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="961"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1076"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML filer (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1199"/>
         <source>Open Dive Log File</source>
         <translation>Öppna dyklogg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <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>Dykloggfiler (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML filer (*.xml);;UDDF/UDCF filer(*.uddf *.udcf);;JDiveLog filer(*.jlb);;Suunto filer(*.sde *.db);;CSV Files(*.csv);;Alla filer(*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1225"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Först avsluta den aktuella ändringen innan du försöker göra en annan.</translation>
     </message>
 </context>
 <context>
+    <name>PlannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Last stop at 20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="416"/>
+        <source>Last stop at 6m</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>PreferencesDialog</name>
     <message>
         <location filename="../qt-ui/preferences.ui" line="85"/>
@@ -1827,247 +1928,297 @@ vänligen ta bort dessa först.</translation>
         <translation>Språk</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="151"/>
         <source>Lists and Tables</source>
         <translation>Listor och tabeller</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="167"/>
         <source>Font size</source>
         <translation>Fontstorlek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="170"/>
+        <location filename="../qt-ui/preferences.ui" line="180"/>
         <source>Dives</source>
         <translation>Dyk</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>Standard dykfil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="188"/>
+        <location filename="../qt-ui/preferences.ui" line="198"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="197"/>
+        <location filename="../qt-ui/preferences.ui" line="207"/>
         <source>Display Invalid</source>
         <translation>Display ogiltig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="214"/>
+        <location filename="../qt-ui/preferences.ui" line="224"/>
         <source>Default Cylinder</source>
         <translation>Standardflaska</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>Använd standardflaska</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <location filename="../qt-ui/preferences.ui" line="247"/>
         <source>Animations</source>
         <translation>Animationer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <location filename="../qt-ui/preferences.ui" line="253"/>
         <source>Speed</source>
         <translation>Hastighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="270"/>
+        <location filename="../qt-ui/preferences.ui" line="280"/>
         <source>Subsurface Webservice</source>
         <translation>Subsurface Webbtjänst</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>Förvalt Användarid</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>Spara användarid lokalt?</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="312"/>
+        <source>Reset all settings to their default value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="348"/>
         <source>Metric</source>
         <translation>Metrisk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="333"/>
+        <location filename="../qt-ui/preferences.ui" line="358"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="343"/>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
         <source>Personalize</source>
         <translation>Personifiera</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="392"/>
         <source>Depth</source>
         <translation>Djup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="374"/>
+        <location filename="../qt-ui/preferences.ui" line="399"/>
         <source>meter</source>
         <translation>meter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="409"/>
         <source>feet</source>
         <translation>fot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="401"/>
+        <location filename="../qt-ui/preferences.ui" line="426"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="411"/>
+        <location filename="../qt-ui/preferences.ui" line="436"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="428"/>
+        <location filename="../qt-ui/preferences.ui" line="453"/>
         <source>liter</source>
         <translation>liter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="438"/>
+        <location filename="../qt-ui/preferences.ui" line="463"/>
         <source>cu ft</source>
         <translation>ft³</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="455"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="465"/>
+        <location filename="../qt-ui/preferences.ui" line="490"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="482"/>
+        <location filename="../qt-ui/preferences.ui" line="507"/>
         <source>kg</source>
         <translation>kg</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>tröskelvärde vid visning av pO₂</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>tröskelvärde vid visning av pN₂</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>tröskelvärde vid visning av pHe</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="636"/>
-        <source>max ppO₂ when showing MOD</source>
-        <translation>Maximalt ppO₂ för visning av MOD</translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="811"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="817"/>
+        <source>Proxy type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="830"/>
+        <source>Host</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="856"/>
+        <source>Port</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="882"/>
+        <source>Requires authentication</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="657"/>
+        <location filename="../qt-ui/preferences.ui" line="925"/>
+        <source>Password</source>
+        <translation>Lösenord</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="682"/>
         <source>draw dive computer reported ceiling red</source>
         <translation>visa dykdatorrapporterad takinformation i rött</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="747"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>System Default</source>
         <translation>Systemets standardvärde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="767"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="419"/>
         <source>Pressure</source>
         <translation>Tryck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="421"/>
+        <location filename="../qt-ui/preferences.ui" line="446"/>
         <source>Volume</source>
         <translation>Volym</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="448"/>
+        <location filename="../qt-ui/preferences.ui" line="473"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="475"/>
+        <location filename="../qt-ui/preferences.ui" line="500"/>
         <source>Weight</source>
         <translation>Vikt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="517"/>
         <source>lbs</source>
         <translation>pund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="507"/>
+        <location filename="../qt-ui/preferences.ui" line="532"/>
         <source>Time units</source>
         <translation>Tidsenheter</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>Hastighetsnämnare.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="520"/>
+        <location filename="../qt-ui/preferences.ui" line="545"/>
         <source>Minutes</source>
         <translation>Minuter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="530"/>
+        <location filename="../qt-ui/preferences.ui" line="555"/>
         <source>Seconds</source>
         <translation>Sekunder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="562"/>
+        <location filename="../qt-ui/preferences.ui" line="587"/>
         <source>Show</source>
         <translation>Visa</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="693"/>
         <source>Show non-used cylinders in Equipment Tab</source>
         <translation>Visa oanvända flaskor i utrustningsfliken</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>visa medeldjup</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>GFLow på maxdjup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="691"/>
+        <location filename="../qt-ui/preferences.ui" line="716"/>
         <source>Misc</source>
         <translation>Blandat</translation>
     </message>
@@ -2077,35 +2228,65 @@ vänligen ta bort dessa först.</translation>
         <translation>Inställningar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="697"/>
+        <location filename="../qt-ui/preferences.ui" line="722"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="739"/>
         <source>GFHigh</source>
         <translation>GFHigh</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="24"/>
+        <source>System proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="25"/>
+        <source>HTTP proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="26"/>
+        <source>SOCKS proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="245"/>
         <source>Restart required</source>
         <translation>Omstart krävs</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>För att ladda nytt språk fullständigt måste Subsurface startas om.</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>Välj standard loggfil</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>Subsurface XML filer (*.ssrf *.xml *.XML)</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="394"/>
+        <source>Warning</source>
+        <translation>Varning</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"/>
+    </message>
 </context>
 <context>
     <name>PrintDialog</name>
@@ -2246,72 +2427,72 @@ vänligen ta bort dessa först.</translation>
 <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>okänd</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>Dyk #%1 - %2</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>Maxdjup: %1 %2</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>Varaktighet: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1918"/>
+        <location filename="../qt-ui/models.cpp" line="1898"/>
         <source>Gas Used:</source>
         <translation>Gas använd:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1920"/>
+        <location filename="../qt-ui/models.cpp" line="1900"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1922"/>
+        <location filename="../qt-ui/models.cpp" line="1902"/>
         <source>Max. CNS:</source>
         <translation>Max. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1924"/>
+        <location filename="../qt-ui/models.cpp" line="1904"/>
         <source>Weights:</source>
         <translation>Vikter:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1929"/>
+        <location filename="../qt-ui/models.cpp" line="1909"/>
         <source>Notes:</source>
         <translation>Anteckningar:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1936"/>
+        <location filename="../qt-ui/models.cpp" line="1916"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1938"/>
+        <location filename="../qt-ui/models.cpp" line="1918"/>
         <source>Buddy:</source>
         <translation>Parkamrat:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1940"/>
+        <location filename="../qt-ui/models.cpp" line="1920"/>
         <source>Suit:</source>
         <translation>Dräkt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1942"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>Viz:</source>
         <translation>Sikt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1944"/>
+        <location filename="../qt-ui/models.cpp" line="1924"/>
         <source>Rating:</source>
         <translation>Ranking:</translation>
     </message>
@@ -2319,62 +2500,77 @@ vänligen ta bort dessa först.</translation>
 <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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/>
+        <source>Make first divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="906"/>
+        <source>Delete this divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="913"/>
         <source>Add Gas Change</source>
         <translation>Lägg till gasbyte</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>Lägg till bokmärke</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>Ta bort händelse</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>Göm liknande händelser</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>Ändra namn</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>Visa alla händelser</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>Göm händelser</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>Göm alla %1händelser</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>Ta bort markerad händelse</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>%1 @ %2:%3</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>Ändra namnet på bokmärket</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>Valt namn:</translation>
     </message>
@@ -2382,12 +2578,12 @@ vänligen ta bort dessa först.</translation>
 <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>LUFT</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>Ta bort denna punkt</translation>
     </message>
@@ -2397,22 +2593,22 @@ vänligen ta bort dessa först.</translation>
         <translation>Stäng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="34"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation>Genomsnitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="37"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="40"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation>Maximum</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>Flytta runt kartan och dubbelklicka för att ställa in dykplats</translation>
     </message>
@@ -2426,9 +2622,23 @@ vänligen ta bort dessa först.</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="128"/>
         <source>New starting number</source>
         <translation>Nytt startnummer</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="126"/>
+        <source>New number</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchBar</name>
+    <message>
+        <location filename="../qt-ui/searchbar.ui" line="14"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
 </context>
 <context>
     <name>ShiftImageTimesDialog</name>
@@ -2443,42 +2653,47 @@ vänligen ta bort dessa först.</translation>
         <translation>Skifta tider på bild(er) med</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="102"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="95"/>
+        <source>h:mm</source>
+        <translation>h:mm</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="105"/>
         <source>earlier</source>
         <translation>tidigare</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="109"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="112"/>
         <source>later</source>
         <translation>senare</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>För att beräkna skillnaden emellan klockorna i dykdator och kamera använd kameran för att ta en bild av dykdatorn när den visar nuvarande tid. Ladda ner den bilden till din dator och tryck på den här knappen.</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>Detektera kamerans tidsskevning</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>Välj bild som visar dykdatorns tid</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>Vilket datum och tid visas på bilden?</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>Öppna bildfil</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>Bildfiler (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2558,42 +2773,42 @@ vänligen ta bort dessa först.</translation>
 <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>Webbtjänst</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/>
         <source>Connecting...</source>
         <translation>Ansluter...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="421"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="419"/>
         <source>Download finished</source>
         <translation>Nedladdning klar</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>Nedladdningsfel: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/>
         <source>Connection Error: </source>
         <translation>Kontaktfel:</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>Ogiltigt användarid!</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>Kan inte tolka respons</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/>
         <source>Download Success!</source>
         <translation>Nedladdning lyckades!</translation>
     </message>
@@ -2609,17 +2824,17 @@ vänligen ta bort dessa först.</translation>
 <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>Beskrivning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2627,7 +2842,7 @@ vänligen ta bort dessa först.</translation>
 <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>Information</translation>
     </message>
@@ -2635,42 +2850,42 @@ vänligen ta bort dessa först.</translation>
 <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>Sök efter uppdateringar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="37"/>
-        <source>&lt;h3&gt;Subsurface was unable to check for updates.&lt;/h3&gt;</source>
-        <translation>&lt;h3&gt;Subsurface kunde inte söka efter uppdateringar.&lt;/h3&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="36"/>
+        <source>Subsurface was unable to check for updates.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
-        <source>&lt;br/&gt;&lt;b&gt;The following error occurred:&lt;/b&gt;&lt;br/&gt;</source>
-        <translation>&lt;br/&gt;&lt;b&gt;Följande fel uppstod:&lt;/b&gt;&lt;br/&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="41"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="43"/>
-        <source>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Please check your internet connection.&lt;/b&gt;</source>
-        <translation>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Vänligen kolla din internetanslutning.&lt;/b&gt;</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
     </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>Du använder den senaste versionen av Subsurface.</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>Det finns en ny version av Subsurface tillgänglig.&lt;br/&gt;Klicka på:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; för att ladda ner den.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="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>&lt;b&gt;Det finns en ny version av Subsurface tillgänglig.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</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>Ett fel uppstod vid sökningen efter uppdateringar.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -2678,25 +2893,163 @@ vänligen ta bort dessa först.</translation>
 <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>Användarmanual</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>Kan inte hitta Subsurface manualen</translation>
     </message>
 </context>
 <context>
+    <name>UserSurvey</name>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>Dialog</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="47"/>
+        <source>Subsurface User Survey</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="79"/>
+        <source>Recreational DIver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="92"/>
+        <source>Tech Diver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="105"/>
+        <source>Interested in dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="118"/>
+        <source>I am downloading dives from supported dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="131"/>
+        <source>I am importing dives from other software / sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="144"/>
+        <source>I am manually entering dives</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="190"/>
+        <source>Please type suggestions (in English) in the following box</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="27"/>
+        <source>
+Operating System: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="30"/>
+        <source>
+CPU Architecture: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="35"/>
+        <source>
+OS CPU Architecture %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="39"/>
+        <source>
+Language: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="73"/>
+        <source>Should we ask you later?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="74"/>
+        <source>Don&apos;t ask me again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="75"/>
+        <source>Ask Later</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="76"/>
+        <source>Ask again?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <source>Submit User Survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <source>Subsurface was unable to submit the user survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="101"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="102"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="111"/>
+        <source>Survey successfully submitted.</source>
+        <translation type="unfinished"/>
+    </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>Ett fel uppstod vid sökningen efter uppdateringar.&lt;br/&gt;&lt;br/&gt;%1</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>Beskrivning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="723"/>
+        <location filename="../qt-ui/models.cpp" line="721"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2744,12 +3097,12 @@ vänligen ta bort dessa först.</translation>
         <translation>Ladda upp</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>Begäran tog för lång tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="279"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="277"/>
         <source>Transfering data...</source>
         <translation>Överför data...</translation>
     </message>
@@ -2757,37 +3110,37 @@ vänligen ta bort dessa först.</translation>
 <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>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="368"/>
+        <location filename="../qt-ui/models.cpp" line="373"/>
         <source>Weight</source>
         <translation>Vikt</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>Klicka här för att ta bort detta viktsystem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="453"/>
+        <location filename="../qt-ui/models.cpp" line="458"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="454"/>
+        <location filename="../qt-ui/models.cpp" line="459"/>
         <source>lbs</source>
         <translation>pund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="478"/>
+        <location filename="../qt-ui/models.cpp" line="483"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="484"/>
         <source>m</source>
         <translation>m</translation>
     </message>
@@ -2795,76 +3148,76 @@ vänligen ta bort dessa först.</translation>
 <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>År
 &gt; Månad / Resa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1643"/>
         <source>Duration 
  Total</source>
         <translation>Varaktighet
 Total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>
 Average</source>
         <translation>Genomsnitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>
 Shortest</source>
         <translation>Kortaste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>
 Longest</source>
         <translation>Längsta</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>Djup (%1)
 Medel</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>
 Minimum</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>
 Maximum</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>SAC (%1)
 Medel</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>Temp. (%1)
@@ -2874,99 +3227,92 @@ Medel</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="58"/>
+        <location filename="../dive.c" line="87"/>
         <source>pascal</source>
         <translation>pascal</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>bar</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>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="104"/>
-        <location filename="../qt-gui.cpp" line="292"/>
-        <source>l</source>
-        <translation>l</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>ft³</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>m</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>ft</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>pund</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>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1120"/>
+        <location filename="../dive.c" line="1237"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) eller (%s)</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>luft</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="170"/>
+        <location filename="../equipment.c" line="210"/>
         <source>integrated</source>
         <translation>integrerat</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="171"/>
+        <location filename="../equipment.c" line="211"/>
         <source>belt</source>
         <translation>bälte</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="172"/>
+        <location filename="../equipment.c" line="212"/>
         <source>ankle</source>
         <translation>ankel</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="173"/>
+        <location filename="../equipment.c" line="213"/>
         <source>backplate weight</source>
         <translation>Ryggplattans vikt</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="174"/>
+        <location filename="../equipment.c" line="214"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -2983,253 +3329,253 @@ Medel</translation>
         <translation>Maximalt antalet kolumner i CSV import är %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>none</source>
         <translation>inget</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>deco stop</source>
         <translation>dekostopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ascent</source>
         <translation>uppstigning</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ceiling</source>
         <translation>ceiling</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>workload</source>
         <translation>arbetsbelastning</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>transmitter</source>
         <translation>sändare</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>violation</source>
         <translation>kränkning</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>bookmark</source>
         <translation>bokmärke</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>surface</source>
         <translation>ytan</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>safety stop</source>
         <translation>säkerhetsstopp</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>gasbyte</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (voluntary)</source>
         <translation>säkerhetsstopp (frivilligt)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (mandatory)</source>
         <translation>säkerhetsstopp (obligatoriskt)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>deepstop</source>
         <translation>djupstopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>ceiling (safety stop)</source>
         <translation>ceiling (säkerhetsstopp)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>divetime</source>
         <translation>dyktid</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>under golv</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>maxdepth</source>
         <translation>Maxdjup</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>airtime</source>
         <translation>gastid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>heading</source>
         <translation>riktning</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>tissue level warning</source>
         <translation>vävnadsnivå</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>non stop time</source>
         <translation>non stop tid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="163"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>invalid event number</source>
         <translation>okänt händelsenummer</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>Kan inte skapa parser för %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="411"/>
+        <location filename="../libdivecomputer.c" line="414"/>
         <source>Error registering the data</source>
         <translation>Kunde inte registrera parser-data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="419"/>
+        <location filename="../libdivecomputer.c" line="422"/>
         <source>Error parsing the datetime</source>
         <translation>Kunde inte tolka tid och datum</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="438"/>
         <source>Dive %d: %s %d %04d</source>
         <translation>Dyk #%d: %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="440"/>
+        <location filename="../libdivecomputer.c" line="443"/>
         <source>Error parsing the divetime</source>
         <translation>Kunde inte tolka dyktid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="449"/>
+        <location filename="../libdivecomputer.c" line="452"/>
         <source>Error parsing the maxdepth</source>
         <translation>Kunde inte tolka maxdjup</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="458"/>
+        <location filename="../libdivecomputer.c" line="461"/>
         <source>Error parsing the gas mix count</source>
         <translation>Kunde inte tolka antal gasblandningar</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="470"/>
+        <location filename="../libdivecomputer.c" line="473"/>
         <source>Error obtaining water salinity</source>
         <translation>Kunde inte ladda vattnets salthalt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error obtaining surface pressure</source>
         <translation>Kunde inte få tag i tyck vid ytan</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the gas mix</source>
         <translation>Kunde inte tolka gasblandning</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="493"/>
+        <location filename="../libdivecomputer.c" line="496"/>
         <source>Error parsing the samples</source>
         <translation>Kunde inte tolka sampel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="623"/>
+        <location filename="../libdivecomputer.c" line="626"/>
         <source>Event: waiting for user action</source>
         <translation>Händelse: väntar på användaren</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>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="691"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the event handler.</source>
         <translation>Kunde inte registrera event-funktion</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="696"/>
+        <location filename="../libdivecomputer.c" line="699"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Kunde inte registrera avbrytningsrutin</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="717"/>
+        <location filename="../libdivecomputer.c" line="720"/>
         <source>Dive data import error</source>
         <translation>Lyckades inte importera dykdata</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="756"/>
+        <location filename="../libdivecomputer.c" line="759"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Kan inte skapa libdivecomputer context</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="763"/>
+        <location filename="../libdivecomputer.c" line="766"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Kunde inte öppna fil %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="462"/>
+        <location filename="../parse-xml.c" line="466"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Konstig procent läsning %s
 </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>Kunde inte läsa &apos;%s&apos;</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>Databasfråga get_events misslyckades.
 </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>Databasfrågan get_tags misslyckades.
@@ -3237,117 +3583,166 @@ Medel</translation>
     </message>
     <message>
         <location filename="../file.c" line="166"/>
-        <source>Database connection failed &apos;%s&apos;.
+        <source>Database connection failed '%s'.
 </source>
         <translation>Databasanslutning misslyckades &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1887"/>
-        <location filename="../parse-xml.c" line="2034"/>
-        <source>Database query failed &apos;%s&apos;.
+        <location filename="../parse-xml.c" line="1945"/>
+        <location filename="../parse-xml.c" line="2092"/>
+        <source>Database query failed '%s'.
 </source>
         <translation>Databasfråga misslyckades &apos;%s&apos;.
 </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>Databasfrågan get_cylinders misslyckades.
 </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>Databasfrågan get_changes misslyckades.
 </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>Databasfrågan get_profile_sample misslyckades.
 </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>Kunde inte öppna formatmall %s</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>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="146"/>
-        <location filename="../planner.c" line="617"/>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation>Kan inte hitta gasen %d/%d</translation>
+        <location filename="../planner.c" line="159"/>
+        <location filename="../planner.c" line="752"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="308"/>
+        <location filename="../planner.c" line="345"/>
         <source>Too many gas mixes</source>
         <translation>För många gasblandningar</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="489"/>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation>%s
-Subsurface dykplan
-baserad på GFlow = %.0f och GFhigh = %.0f
-
-</translation>
+        <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>VARNING: DETTA ÄR EN NY IMPLEMENTATION AV BÜHLMANN&apos;S DEKO ALGORITM OCH EN DYKPLANERARE BASERAD PÅ DEN, OCH KODEN HAR SETT ENDAST LITE TESTNING. VI FÖRESLÅR ATT MAN INTE GÖR DYK BASERADE ENBART PÅ RESULTATEN AV DENNA PLAN!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="530"/>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Dyk till %.*f %s i %d:%02d min - totaltid %d:%02u on %s
-</translation>
+        <location filename="../planner.c" line="535"/>
+        <source>based on GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="539"/>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Stanna vid %.*f %s för %d:%02d min - totaltid %d:%02u on %s
-</translation>
+        <location filename="../planner.c" line="538"/>
+        <source>Subsurface dive plan</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="550"/>
-        <source>Switch gas to %s
-</source>
-        <translation>Byt till gas %s
-</translation>
+        <location filename="../planner.c" line="542"/>
+        <source>depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="558"/>
-        <source>Gas consumption:
-</source>
-        <translation>Gasanvändning:
-</translation>
+        <location filename="../planner.c" line="545"/>
+        <source>runtime</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="569"/>
-        <source>%.0f%s of %s
-</source>
-        <translation>%.0f%s av %s
-</translation>
+        <location filename="../planner.c" line="548"/>
+        <source>duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="551"/>
+        <source>gas</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="606"/>
+        <source>%3.0f%s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="810"/>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
+        <source>%3dmin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="629"/>
+        <source>Switch gas to %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="638"/>
+        <source>Gas consumption:</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="659"/>
+        <source>this is more gas than available in the specified cylinder!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="664"/>
+        <source>not enough reserve for gas sharing on ascent!</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="668"/>
+        <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="980"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1226"/>
+        <location filename="../profile.c" line="1250"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3356,70 +3751,69 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1229"/>
+        <location filename="../profile.c" line="1253"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1233"/>
+        <location filename="../profile.c" line="1257"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1263"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </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>SAC: %2.1fl/min
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1244"/>
+        <location filename="../profile.c" line="1268"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1246"/>
+        <location filename="../profile.c" line="1270"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1272"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="1274"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="1277"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1260"/>
+        <location filename="../profile.c" line="1284"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3428,7 +3822,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1264"/>
+        <location filename="../profile.c" line="1288"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3437,402 +3831,395 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1276"/>
+        <location filename="../profile.c" line="1300"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Säkerhetsstopp: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1279"/>
+        <location filename="../profile.c" line="1303"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Säkerhetsstopp: okänd tid @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="1308"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
+        <location filename="../profile.c" line="1311"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deko: okänd tid @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1291"/>
+        <location filename="../profile.c" line="1315"/>
         <source>In deco
 </source>
         <translation>I Deko
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1293"/>
+        <location filename="../profile.c" line="1317"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1297"/>
+        <location filename="../profile.c" line="1321"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1305"/>
+        <location filename="../profile.c" line="1329"/>
         <source>In deco (calc)
 </source>
         <translation>I deko (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1307"/>
+        <location filename="../profile.c" line="1331"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1310"/>
+        <location filename="../profile.c" line="1334"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1313"/>
+        <location filename="../profile.c" line="1337"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Beräknat tak %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1319"/>
+        <location filename="../profile.c" line="1343"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Vävnad %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1325"/>
+        <location filename="../profile.c" line="1349"/>
         <source>heartbeat: %d
 </source>
         <translation>hjärtrytm: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1327"/>
+        <location filename="../profile.c" line="1351"/>
         <source>bearing: %d
 </source>
         <translation>kurs: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1419"/>
+        <location filename="../profile.c" line="1443"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</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>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1435"/>
+        <location filename="../profile.c" line="1459"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1439"/>
+        <location filename="../profile.c" line="1463"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</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>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1454"/>
+        <location filename="../profile.c" line="1478"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="273"/>
+        <location filename="../qt-gui.cpp" line="281"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="276"/>
+        <location filename="../qt-gui.cpp" line="284"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="392"/>
-        <source>%1, %2 %3, %4 %5:%6</source>
-        <translation>%1, %2 %3, %4 %5:%6</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="405"/>
-        <source>%1 %2, %3
-%4:%5</source>
-        <translation>%1 %2, %3
-%4:%5</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="418"/>
+        <location filename="../qt-gui.cpp" line="417"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 dyk)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="423"/>
+        <location filename="../qt-gui.cpp" line="422"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 dyk)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>boat</source>
         <translation>båt</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>shore</source>
         <translation>strand</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>drift</source>
         <translation>ström</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>deep</source>
         <translation>djup</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>cavern</source>
         <translation>cavern</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>ice</source>
         <translation>is</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>wreck</source>
         <translation>vrak</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>cave</source>
         <translation>grotta</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>altitude</source>
         <translation>höjd</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>pool</source>
         <translation>pool</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>lake</source>
         <translation>sjö</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>river</source>
         <translation>älv</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>night</source>
         <translation>natt</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>fresh</source>
         <translation>färsk</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>student</source>
         <translation>student</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>photo</source>
         <translation>foto</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>video</source>
         <translation>video</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>instructor</source>
         <translation>Instruktör</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="25"/>
         <source>deco</source>
         <translation>deko</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="216"/>
+        <location filename="../dive.c" line="133"/>
+        <source>ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="214"/>
         <source>more than %d days</source>
         <translation>mer än %d dagar</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="220"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dt %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="224"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dh %dmin</source>
         <translation>%dt %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="235"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation>för dykningar #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="242"/>
+        <location filename="../statistics.c" line="240"/>
         <source>for selected dives</source>
         <translation>för utvalda dyk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="275"/>
         <source>for dive #%d</source>
         <translation>Dyk #%d </translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for selected dive</source>
         <translation>för valt dyk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for all dives</source>
         <translation>för alla dyk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="283"/>
+        <location filename="../statistics.c" line="281"/>
         <source>(no dives)</source>
         <translation>(inga dyk)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sun</source>
         <translation>sön</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Mon</source>
         <translation>mån</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Tue</source>
         <translation>tis</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Wed</source>
         <translation>ons</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Thu</source>
         <translation>tor</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Fri</source>
         <translation>fre</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sat</source>
         <translation>lör</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jan</source>
         <translation>jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Feb</source>
         <translation>feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Mar</source>
         <translation>mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Apr</source>
         <translation>apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>May</source>
         <translation>maj</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jun</source>
         <translation>jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Jul</source>
         <translation>jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Aug</source>
         <translation>aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Sep</source>
         <translation>sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Oct</source>
         <translation>okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Nov</source>
         <translation>nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Dec</source>
         <translation>dec</translation>
     </message>
@@ -3862,97 +4249,97 @@ Is the Uemis Zurich plugged in correctly?</source>
 Är Uemis Zurich ordentligt ansluten?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="107"/>
+        <location filename="../uemis-downloader.c" line="111"/>
         <source>unknown</source>
         <translation>okänd</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="379"/>
+        <location filename="../uemis-downloader.c" line="383"/>
         <source>Reading %s %s</source>
         <translation>Läser %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="399"/>
+        <location filename="../uemis-downloader.c" line="403"/>
         <source>data</source>
         <translation>data</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="420"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>divelog entry id</source>
         <translation>dyklog ID</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="422"/>
+        <location filename="../uemis-downloader.c" line="426"/>
         <source>divespot data id</source>
         <translation>dykplats ID</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
+        <location filename="../uemis-downloader.c" line="428"/>
         <source>more data dive id</source>
         <translation>mer data dive id</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>wetsuit</source>
         <translation>våtdräkt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>semidry</source>
         <translation>semidry</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>drysuit</source>
         <translation>torrdräkt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>shorty</source>
         <translation>shorty</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>vest</source>
         <translation>väst</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>long john</source>
         <translation>Longjohn</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>jacket</source>
         <translation>jacka</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>full suit</source>
         <translation>fulldräkt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>2 pcs full suit</source>
         <translation>2 pcs full suit</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="620"/>
+        <location filename="../uemis-downloader.c" line="624"/>
         <source>membrane</source>
         <translation>membran</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="802"/>
+        <location filename="../uemis-downloader.c" line="823"/>
         <source>Init Communication</source>
         <translation>Initierar anslutning</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="804"/>
+        <location filename="../uemis-downloader.c" line="825"/>
         <source>Uemis init failed</source>
         <translation>Kunde inte läsa från Uemis</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="815"/>
+        <location filename="../uemis-downloader.c" line="836"/>
         <source>Start download</source>
         <translation>Starta nedladdningen</translation>
     </message>
@@ -3973,18 +4360,18 @@ Is the Uemis Zurich plugged in correctly?</source>
     </message>
     <message>
         <location filename="../uemis.c" line="203"/>
-        <source>PO2 Green Warning</source>
-        <translation>Varning: grön PO2</translation>
+        <source>pO₂ Green Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
-        <source>PO2 Ascend Warning</source>
-        <translation>Varning: uppstigning / PO2</translation>
+        <source>pO₂ Ascend Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="208"/>
-        <source>PO2 Ascend Alarm</source>
-        <translation>Alarm: uppstigning / PO2</translation>
+        <source>pO₂ Ascend Alarm</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
@@ -4046,5 +4433,214 @@ Is the Uemis Zurich plugged in correctly?</source>
         <source>Low Battery Alert</source>
         <translation>Batterivarning</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"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="36"/>
+        <source>Date:</source>
+        <translation>Datum:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="38"/>
+        <source>Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="40"/>
+        <source>Duration:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="41"/>
+        <source>min</source>
+        <translation>Min</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="43"/>
+        <source>Max Depth:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="46"/>
+        <source>Air Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="48"/>
+        <source>Water Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="50"/>
+        <source>Location:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="54"/>
+        <source>Notes:</source>
+        <translation>Anteckningar:</translation>
+    </message>
+</context>
+<context>
+    <name>plannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="14"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="35"/>
+        <source>Rates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="56"/>
+        <source>Ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="77"/>
+        <source>below 75% avg. depth</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="94"/>
+        <source>75%-50% avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="111"/>
+        <source>50% avg. depth - 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="128"/>
+        <source>6m/20ft to surface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="148"/>
+        <source>Descent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="200"/>
+        <source>surface to the bottom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="226"/>
+        <source>Planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="247"/>
+        <source>GF low</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="264"/>
+        <source>GF high</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
+        <source>Drop to first depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
+        <source>Last Stop at 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>plan backgas breaks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="318"/>
+        <source>Gas Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <source>bottom SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="349"/>
+        <source>deco SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="359"/>
+        <source>bottom pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="389"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="382"/>
+        <source>deco pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="421"/>
+        <source>Dive Notes</source>
+        <translation>Dykanteckningar</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="445"/>
+        <source>display runtime</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="458"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="461"/>
+        <source>display segment duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="471"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="474"/>
+        <source>display transitions in deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="481"/>
+        <source>verbatim diveplan</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/subsurface_tr.ts b/translations/subsurface_tr.ts
index 3ea4b78eb..90f264045 100644
--- a/translations/subsurface_tr.ts
+++ b/translations/subsurface_tr.ts
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="tr">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="tr" version="2.0">
+<defaultcodec>UTF-8</defaultcodec>
 <context>
     <name>CylindersModel</name>
     <message>
@@ -16,22 +15,22 @@
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
         <source>WorkPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
         <source>StartPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
         <source>EndPress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
         <source>He%</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
@@ -39,44 +38,44 @@
         <translation>O</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -84,230 +83,366 @@
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.ui" line="17"/>
         <source>Edit Dive Computer Nicknames</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
         <source>Remove the selected Dive Computer?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>Model</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <source>/min</source>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
-        <source>save As</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/divelistview.cpp" line="744"/>
+        <source>renumber dive(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="763"/>
-        <source>export As UDDF</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <source>shift times</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="764"/>
-        <source>export As CSV</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <source>load images</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="765"/>
-        <source>shift times</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Open Image Files</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="766"/>
-        <source>load images</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <source>merge selected dives</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DiveLogExportDialog</name>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
+        <source>Export Dive Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="24"/>
+        <source>General Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="30"/>
+        <source>Export format</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="769"/>
-        <source>upload dive(s) to divelogs.de</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="42"/>
+        <source>Subsurface XML</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="795"/>
-        <source>Save Dives As...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="61"/>
+        <source>UDDF</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="814"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="74"/>
+        <source>divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="84"/>
+        <source>CSV</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="94"/>
+        <source>Worldmap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="107"/>
+        <source>Selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="116"/>
+        <source>Selected dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="126"/>
+        <source>All dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="178"/>
+        <source>HTML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="184"/>
+        <source>General Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="190"/>
+        <source>Subsurface Numbers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="203"/>
+        <source>Selected Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="216"/>
+        <source>Minimum Javascript</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="229"/>
+        <source>All Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="239"/>
+        <source>Export List only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="252"/>
+        <source>Style Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="264"/>
+        <source>Font</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="274"/>
+        <source>Font size</source>
+        <translation>Yazı tipi boyutu</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
+        <source>8</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <source>10</source>
+        <translation>10</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <source>12</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <source>14</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <source>16</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <source>18</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <source>20</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="323"/>
+        <source>Theme</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <source>Sand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="153"/>
         <source>Export UDDF File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>UDDF dosyaları (*.uddf *.UDDF)</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Open Image Files</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="162"/>
+        <source>Export World Map</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="163"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="177"/>
+        <source>HTML files (*.html)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="760"/>
-        <source>merge selected dives</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="167"/>
+        <source>Export Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="168"/>
+        <source>XML files (*.xml *.ssrf)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="176"/>
+        <source>Export HTML files as</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -315,266 +450,227 @@
     <message>
         <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
         <source>Import dive log file</source>
-        <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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>Zaman</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>Metrik</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="317"/>
         <source>Date</source>
         <translation>Tarih</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="385"/>
         <source>Duration</source>
         <translation>Süre</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
         <source>Location</source>
         <translation>Konum</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="78"/>
-        <source>GFHigh</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="98"/>
-        <source>GFLow</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/diveplanner.ui" line="106"/>
+        <source>Planned Dive Time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="125"/>
-        <source>Last Stop at 6m</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/diveplanner.ui" line="134"/>
+        <source>Altitude</source>
+        <translation type="unfinished"/>
     </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>
-        <translation type="unfinished">10m</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="116"/>
-        <source>30ft</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="363"/>
-        <source>Handler Position Error</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/diveplanner.ui" line="148"/>
+        <source>mbar</source>
+        <translation type="unfinished"/>
     </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>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/diveplanner.ui" line="158"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="445"/>
-        <source>AIR</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="137"/>
+        <source>unknown</source>
+        <translation>bilinmeyen</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1152"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="590"/>
         <source>Duration</source>
         <translation>Süre</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -582,7 +678,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="93"/>
         <source>Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="95"/>
@@ -602,290 +698,290 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/>
         <source>Color</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
         <source>User Entered</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
         <source>Cylinder Index</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
-        <source>Pressure  S</source>
-        <translation type="unfinished"></translation>
+        <source>Pressure S</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
-        <source>Pressure I</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <source>pN₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
-        <source>Ceiling</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>pHe</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
-        <source>SAC</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>pO₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
-        <source>PN2</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <source>Pressure I</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
-        <source>PHE</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <source>Ceiling</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
-        <source>PO2</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <source>SAC</source>
+        <translation type="unfinished"/>
     </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>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>date</source>
         <translation>tarih</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>m</source>
         <translation>m</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>kg</source>
         <translation>kg</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>Bitti</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="868"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Error: %1</source>
         <translation>Hata: %1</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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>TAMAM</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="165"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/>
         <source>Error</source>
         <translation>Hata</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -893,22 +989,22 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="14"/>
         <source>Download From Dive Computer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
         <source>Vendor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
         <source>Dive Computer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
         <source>Device or Mount Point</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
@@ -920,12 +1016,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
         <source>Force download of all dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
         <source>Always prefer downloaded dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
@@ -940,865 +1036,871 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
         <source>Save libdivecomputer logfile</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
         <source>Save libdivecomputer dumpfile</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <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>
+        <translation type="unfinished"/>
     </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>Konum</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>Tarih</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="414"/>
+        <location filename="../qt-ui/maintab.ui" line="275"/>
+        <source>Time</source>
+        <translation>Zaman</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="455"/>
         <source>Interval</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="547"/>
+        <location filename="../qt-ui/maintab.ui" line="588"/>
         <source>Air Pressure</source>
         <translation>Hava Basıncı</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="566"/>
+        <location filename="../qt-ui/maintab.ui" line="607"/>
         <source>Air Temperature</source>
         <translation>Hava Sıcaklığı</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="585"/>
+        <location filename="../qt-ui/maintab.ui" line="626"/>
         <source>Water Temperature</source>
         <translation>Su Sıcaklığı</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Temperature</source>
         <translation>Sıcaklık</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="784"/>
         <source>Duration</source>
         <translation>Süre</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
+        <source>Gas Consumption</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="919"/>
+        <source>Photos</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <location filename="../qt-ui/maintab.cpp" line="89"/>
         <source>Cylinders</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="93"/>
         <source>Weights</source>
         <translation>Ağırlıklar</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="42"/>
+        <location filename="../qt-ui/maintab.cpp" line="48"/>
         <source>Save</source>
         <translation>Kaydet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="46"/>
+        <location filename="../qt-ui/maintab.cpp" line="52"/>
         <source>Cancel</source>
         <translation>İptal</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="494"/>
+        <location filename="../qt-ui/maintab.cpp" line="464"/>
         <source>unknown</source>
         <translation>bilinmeyen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>N</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/maintab.cpp" line="501"/>
+        <source>Deepest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>S</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <source>Shallowest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>E</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/maintab.cpp" line="794"/>
+        <source>Discard the Changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>W</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/maintab.cpp" line="795"/>
+        <source>You are about to discard your changes.</source>
+        <translation type="unfinished"/>
     </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>Filtre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="571"/>
+        <location filename="../qt-ui/mainwindow.ui" line="646"/>
         <source>&amp;File</source>
         <translation>&amp;Dosya</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="583"/>
+        <source>Print</source>
+        <translation>Yazdır</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:'Courier'; 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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
         <source>&amp;Log</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="628"/>
+        <location filename="../qt-ui/mainwindow.ui" line="701"/>
         <source>&amp;Help</source>
         <translation>&amp;Yardım</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="655"/>
+        <location filename="../qt-ui/mainwindow.ui" line="728"/>
         <source>New</source>
         <translation>Yeni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="658"/>
+        <location filename="../qt-ui/mainwindow.ui" line="731"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <location filename="../qt-ui/mainwindow.ui" line="742"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="674"/>
+        <location filename="../qt-ui/mainwindow.ui" line="747"/>
         <source>&amp;Save</source>
         <translation>&amp;Kaydet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="677"/>
+        <location filename="../qt-ui/mainwindow.ui" line="750"/>
         <source>Save</source>
         <translation>Kaydet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="680"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>Save as</source>
         <translation>Farklı kaydet</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>Ctrl+Shift+S</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>&amp;Kapat</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Close</source>
         <translation>Kapat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="702"/>
+        <location filename="../qt-ui/mainwindow.ui" line="775"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="902"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <source>P&amp;references</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="831"/>
+        <source>&amp;Add Dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <source>Auto &amp;Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="863"/>
+        <source>&amp;Dive List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="871"/>
+        <source>&amp;Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="879"/>
+        <source>&amp;Info</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="887"/>
+        <source>&amp;All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="895"/>
+        <source>P&amp;rev DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="903"/>
+        <source>&amp;Next DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="911"/>
+        <source>&amp;Select Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <source>&amp;About Subsurface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="937"/>
+        <source>&amp;Globe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="953"/>
+        <source>&amp;Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="959"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="707"/>
-        <source>Export &amp;UDDF</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/mainwindow.ui" line="1008"/>
+        <source>&amp;Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1011"/>
+        <source>Export Dive Logs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1014"/>
+        <source>Ctrl+E</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Enable the pN2 Graph</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <location filename="../qt-ui/mainwindow.ui" line="128"/>
         <source>Enable the pHe graph</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <location filename="../qt-ui/mainwindow.ui" line="290"/>
         <source>Show/hide heart rate</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <location filename="../qt-ui/mainwindow.ui" line="342"/>
         <source>Enable EAD, END, and EADD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="238"/>
         <source>Show NDL / TTS</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="456"/>
+        <location filename="../qt-ui/mainwindow.ui" line="394"/>
         <source>Rescale depth axis</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="710"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="715"/>
-        <source>Export HTML World Map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="718"/>
-        <source>Ctrl+H</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="723"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>&amp;Print</source>
         <translation>&amp;Yazdır</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="734"/>
+        <location filename="../qt-ui/mainwindow.ui" line="791"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="742"/>
+        <location filename="../qt-ui/mainwindow.ui" line="799"/>
         <source>&amp;Quit</source>
         <translation>&amp;Çıkış</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="753"/>
+        <location filename="../qt-ui/mainwindow.ui" line="810"/>
         <source>Import from &amp;dive computer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="818"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="764"/>
+        <location filename="../qt-ui/mainwindow.ui" line="821"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="826"/>
         <source>&amp;Edit Device Names</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="834"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="782"/>
+        <location filename="../qt-ui/mainwindow.ui" line="839"/>
         <source>&amp;Renumber</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="785"/>
+        <location filename="../qt-ui/mainwindow.ui" line="842"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="798"/>
+        <location filename="../qt-ui/mainwindow.ui" line="855"/>
         <source>&amp;Yearly Statistics</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="801"/>
+        <location filename="../qt-ui/mainwindow.ui" line="858"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="806"/>
-        <source>Dive List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="814"/>
-        <source>Profile</source>
-        <translation>Profil</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="822"/>
-        <source>Info</source>
-        <translation>Bilgi</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="830"/>
-        <source>All</source>
-        <translation>Tümü</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="872"/>
+        <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="880"/>
-        <source>Globe</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="888"/>
+        <location filename="../qt-ui/mainwindow.ui" line="945"/>
         <source>P&amp;lan Dive</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="891"/>
+        <location filename="../qt-ui/mainwindow.ui" line="948"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="907"/>
-        <source>Import from Divelogs.de</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <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="951"/>
-        <source>Export CSV</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="726"/>
+        <location filename="../qt-ui/mainwindow.ui" line="783"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</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"/>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="131"/>
+        <location filename="../qt-ui/mainwindow.ui" line="157"/>
+        <location filename="../qt-ui/mainwindow.ui" line="186"/>
+        <location filename="../qt-ui/mainwindow.ui" line="215"/>
+        <location filename="../qt-ui/mainwindow.ui" line="241"/>
+        <location filename="../qt-ui/mainwindow.ui" line="267"/>
+        <location filename="../qt-ui/mainwindow.ui" line="293"/>
+        <location filename="../qt-ui/mainwindow.ui" line="319"/>
+        <location filename="../qt-ui/mainwindow.ui" line="345"/>
+        <location filename="../qt-ui/mainwindow.ui" line="371"/>
+        <location filename="../qt-ui/mainwindow.ui" line="397"/>
+        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>...</source>
         <translation>...</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>Tercihler</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="745"/>
+        <location filename="../qt-ui/mainwindow.ui" line="802"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="756"/>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</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>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="817"/>
+        <location filename="../qt-ui/mainwindow.ui" line="874"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <location filename="../qt-ui/mainwindow.ui" line="882"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="833"/>
+        <location filename="../qt-ui/mainwindow.ui" line="890"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="864"/>
-        <source>About Subsurface</source>
-        <translation>Subsurface Hakkında</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="875"/>
+        <location filename="../qt-ui/mainwindow.ui" line="932"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="883"/>
+        <location filename="../qt-ui/mainwindow.ui" line="940"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="896"/>
-        <source>Import Log Files</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/mainwindow.ui" line="956"/>
+        <source>Import divelog files from other applications</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="899"/>
-        <source>Import divelog files from other applications</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/mainwindow.ui" line="964"/>
+        <source>Import &amp;from Divelogs.de</source>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <location filename="../qt-ui/mainwindow.ui" line="978"/>
         <source>F11</source>
-        <translation type="unfinished">F11</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="174"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
         <source>Open File</source>
         <translation>Dosya Aç</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>
+        <translation type="unfinished"/>
     </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>
-        <translation type="unfinished"></translation>
+        <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"/>
     </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>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/mainwindow.cpp" line="419"/>
+        <source>Print runtime table</source>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="960"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1075"/>
         <source>Save File as</source>
         <translation>Dosyayı Farklı Kaydet</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>UDDF dosyaları (*.uddf *.UDDF)</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>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="300"/>
-        <source>HTML files (*.html)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="449"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="514"/>
         <source>Yearly Statistics</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="961"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1076"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML dosyaları (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1199"/>
         <source>Open Dive Log File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1107"/>
+        <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>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PlannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Last stop at 20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="416"/>
+        <source>Last stop at 6m</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1806,17 +1908,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="85"/>
         <source>Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="95"/>
         <source>Units</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="105"/>
         <source>Graph</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="115"/>
@@ -1824,249 +1926,299 @@ Please, remove them first.</source>
         <translation>Lisan</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="151"/>
         <source>Lists and Tables</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="167"/>
         <source>Font size</source>
         <translation>Yazı tipi boyutu</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="188"/>
+        <location filename="../qt-ui/preferences.ui" line="198"/>
         <source>...</source>
         <translation>...</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="312"/>
+        <source>Reset all settings to their default value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
         <source>System</source>
         <translation>Sistem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="348"/>
         <source>Metric</source>
         <translation>Metrik</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="482"/>
+        <location filename="../qt-ui/preferences.ui" line="507"/>
         <source>kg</source>
         <translation>kg</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="811"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="636"/>
-        <source>max ppO₂ when showing MOD</source>
-        <translation type="unfinished"></translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="817"/>
+        <source>Proxy type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="830"/>
+        <source>Host</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="856"/>
+        <source>Port</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="882"/>
+        <source>Requires authentication</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="925"/>
+        <source>Password</source>
+        <translation>Parola</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="767"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>Filter</source>
         <translation>Filtre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="419"/>
         <source>Pressure</source>
         <translation>Basınç</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="448"/>
+        <location filename="../qt-ui/preferences.ui" line="473"/>
         <source>Temperature</source>
         <translation>Sıcaklık</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="520"/>
+        <location filename="../qt-ui/preferences.ui" line="545"/>
         <source>Minutes</source>
         <translation>Dakika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="530"/>
+        <location filename="../qt-ui/preferences.ui" line="555"/>
         <source>Seconds</source>
         <translation>Saniye</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="562"/>
+        <location filename="../qt-ui/preferences.ui" line="587"/>
         <source>Show</source>
         <translation>Göster</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="693"/>
         <source>Show non-used cylinders in Equipment Tab</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="14"/>
@@ -2074,35 +2226,65 @@ Please, remove them first.</source>
         <translation>Tercihler</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="23"/>
+        <source>No proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="24"/>
+        <source>System proxy</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="230"/>
+        <location filename="../qt-ui/preferences.cpp" line="25"/>
+        <source>HTTP proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="26"/>
+        <source>SOCKS proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="245"/>
         <source>Restart required</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>Subsurface XML dosyaları (*.ssrf *.xml *.XML)</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="394"/>
+        <source>Warning</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
 </context>
 <context>
     <name>PrintDialog</name>
@@ -2127,7 +2309,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Dive#</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="26"/>
@@ -2137,7 +2319,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Depth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="28"/>
@@ -2147,12 +2329,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Master</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Buddy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="31"/>
@@ -2165,72 +2347,72 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="23"/>
         <source>Print options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="41"/>
         <source>Print only selected dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="60"/>
         <source>Print in color</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="86"/>
         <source>Print type</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="116"/>
         <source>6 dives per page</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="132"/>
         <source>2 dives per page</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="145"/>
         <source>Table print</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="162"/>
         <source>Ordering</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="180"/>
         <source>Profile on top</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="202"/>
         <source>Notes on top</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="219"/>
         <source>Sizing heights (% of layout)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="256"/>
         <source>Profile height (43% - 85%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="278"/>
         <source>Other data height (8% - 17%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="338"/>
         <source>Notes height (0% - 52%)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="354"/>
@@ -2243,150 +2425,165 @@ 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>bilinmeyen</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/>
+        <source>Make first divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="906"/>
+        <source>Delete this divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="913"/>
         <source>Add Gas Change</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
@@ -2394,24 +2591,24 @@ Please, remove them first.</source>
         <translation>Kapat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="34"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation>Ortalama</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="37"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation>Asgari</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="40"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation>Azami</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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2419,12 +2616,26 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/renumber.ui" line="17"/>
         <source>Renumber</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="126"/>
+        <source>New number</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchBar</name>
+    <message>
+        <location filename="../qt-ui/searchbar.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2432,52 +2643,57 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/shiftimagetimes.ui" line="23"/>
         <source>Shift selected times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shiftimagetimes.ui" line="34"/>
         <source>Shift times of image(s) by</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="105"/>
         <source>earlier</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2485,43 +2701,43 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="23"/>
         <source>Shift selected times</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="49"/>
         <source>Shift times of selected dives by</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="72"/>
         <source>Shifted time:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="79"/>
         <source>Current time:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="86"/>
         <location filename="../qt-ui/shifttimes.ui" line="93"/>
         <source>0:0</source>
-        <translation type="unfinished">0:0</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="126"/>
         <source>h:mm</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="136"/>
         <source>earlier</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="143"/>
         <source>later</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2549,50 +2765,50 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/about.cpp" line="13"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014&lt;/span&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2600,100 +2816,238 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/tableview.cpp" line="23"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="37"/>
-        <source>&lt;h3&gt;Subsurface was unable to check for updates.&lt;/h3&gt;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="36"/>
+        <source>Subsurface was unable to check for updates.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
-        <source>&lt;br/&gt;&lt;b&gt;The following error occurred:&lt;/b&gt;&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="41"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="43"/>
-        <source>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Please check your internet connection.&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>UserSurvey</name>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="47"/>
+        <source>Subsurface User Survey</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="79"/>
+        <source>Recreational DIver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="92"/>
+        <source>Tech Diver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="105"/>
+        <source>Interested in dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="118"/>
+        <source>I am downloading dives from supported dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="131"/>
+        <source>I am importing dives from other software / sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="144"/>
+        <source>I am manually entering dives</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="190"/>
+        <source>Please type suggestions (in English) in the following box</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="27"/>
+        <source>
+Operating System: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="30"/>
+        <source>
+CPU Architecture: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="35"/>
+        <source>
+OS CPU Architecture %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="39"/>
+        <source>
+Language: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="73"/>
+        <source>Should we ask you later?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="74"/>
+        <source>Don&apos;t ask me again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="75"/>
+        <source>Ask Later</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="76"/>
+        <source>Ask again?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <source>Submit User Survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <source>Subsurface was unable to submit the user survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="101"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="102"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="111"/>
+        <source>Survey successfully submitted.</source>
+        <translation type="unfinished"/>
+    </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"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="723"/>
+        <location filename="../qt-ui/models.cpp" line="721"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2703,7 +3057,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
         <source>Webservice Connection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="25"/>
@@ -2713,22 +3067,22 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/webservices.ui" line="32"/>
         <source>Enter your ID here</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="44"/>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="68"/>
         <source>User ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="85"/>
         <source>Save User ID locally?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="92"/>
@@ -2738,53 +3092,53 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/webservices.ui" line="106"/>
         <source>Upload</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>Tür</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="453"/>
+        <location filename="../qt-ui/models.cpp" line="458"/>
         <source>kg</source>
         <translation>kg</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="484"/>
         <source>m</source>
         <translation>m</translation>
     </message>
@@ -2792,992 +3146,1037 @@ 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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>#</source>
         <translation>#</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>
 Average</source>
         <translation>
 Ortalama</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
 Asgari</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>
 Azami</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="58"/>
+        <location filename="../dive.c" line="87"/>
         <source>pascal</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>m</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1120"/>
+        <location filename="../dive.c" line="1237"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) veya (%s)</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../equipment.c" line="170"/>
+        <location filename="../equipment.c" line="210"/>
         <source>integrated</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../equipment.c" line="171"/>
+        <location filename="../equipment.c" line="211"/>
         <source>belt</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../equipment.c" line="172"/>
+        <location filename="../equipment.c" line="212"/>
         <source>ankle</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../equipment.c" line="173"/>
+        <location filename="../equipment.c" line="213"/>
         <source>backplate weight</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../equipment.c" line="174"/>
+        <location filename="../equipment.c" line="214"/>
         <source>clip-on</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../file.c" line="106"/>
         <location filename="../file.c" line="369"/>
         <source>Failed to read &apos;%s&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../file.c" line="406"/>
         <location filename="../file.c" line="482"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>none</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>deco stop</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>rbt</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ascent</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ceiling</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>workload</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>transmitter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>violation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>bookmark</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>surface</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>safety stop</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (voluntary)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (mandatory)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>deepstop</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>ceiling (safety stop)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>divetime</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>maxdepth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>OLF</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>PO2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>airtime</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>rgbm</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>heading</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>tissue level warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>non stop time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="163"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>invalid event number</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="411"/>
+        <location filename="../libdivecomputer.c" line="414"/>
         <source>Error registering the data</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="419"/>
+        <location filename="../libdivecomputer.c" line="422"/>
         <source>Error parsing the datetime</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="440"/>
+        <location filename="../libdivecomputer.c" line="443"/>
         <source>Error parsing the divetime</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="449"/>
+        <location filename="../libdivecomputer.c" line="452"/>
         <source>Error parsing the maxdepth</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="470"/>
+        <location filename="../libdivecomputer.c" line="473"/>
         <source>Error obtaining water salinity</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error obtaining surface pressure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="493"/>
+        <location filename="../libdivecomputer.c" line="496"/>
         <source>Error parsing the samples</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="717"/>
+        <location filename="../libdivecomputer.c" line="720"/>
         <source>Dive data import error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../file.c" line="166"/>
-        <source>Database connection failed &apos;%s&apos;.
+        <source>Database connection failed '%s'.
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1887"/>
-        <location filename="../parse-xml.c" line="2034"/>
-        <source>Database query failed &apos;%s&apos;.
+        <location filename="../parse-xml.c" line="1945"/>
+        <location filename="../parse-xml.c" line="2092"/>
+        <source>Database query failed '%s'.
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="146"/>
-        <location filename="../planner.c" line="617"/>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation type="unfinished"></translation>
+        <location filename="../planner.c" line="159"/>
+        <location filename="../planner.c" line="752"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="308"/>
+        <location filename="../planner.c" line="345"/>
         <source>Too many gas mixes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="489"/>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation type="unfinished"></translation>
+        <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"/>
     </message>
     <message>
-        <location filename="../planner.c" line="530"/>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../planner.c" line="535"/>
+        <source>based on GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="539"/>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../planner.c" line="538"/>
+        <source>Subsurface dive plan</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="550"/>
-        <source>Switch gas to %s
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../planner.c" line="542"/>
+        <source>depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="558"/>
-        <source>Gas consumption:
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../planner.c" line="545"/>
+        <source>runtime</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="569"/>
-        <source>%.0f%s of %s
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="../planner.c" line="548"/>
+        <source>duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="551"/>
+        <source>gas</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="810"/>
+        <location filename="../planner.c" line="585"/>
+        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="595"/>
+        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="606"/>
+        <source>%3.0f%s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
+        <source>%3dmin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="629"/>
+        <source>Switch gas to %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="638"/>
+        <source>Gas consumption:</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="659"/>
+        <source>this is more gas than available in the specified cylinder!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="664"/>
+        <source>not enough reserve for gas sharing on ascent!</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="668"/>
+        <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="980"/>
         <source>ean</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1229"/>
+        <location filename="../profile.c" line="1253"/>
         <source>P: %d%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1233"/>
+        <location filename="../profile.c" line="1257"/>
         <source>T: %.1f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1263"/>
         <source>V: %.1f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1244"/>
+        <location filename="../profile.c" line="1268"/>
         <source>CNS: %u%%
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1246"/>
+        <location filename="../profile.c" line="1270"/>
         <source>pO%s: %.2fbar
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1272"/>
         <source>pN%s: %.2fbar
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="1274"/>
         <source>pHe: %.2fbar
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="1277"/>
         <source>MOD: %d%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1276"/>
+        <location filename="../profile.c" line="1300"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="1308"/>
         <source>Deco: %umin @ %.0f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1291"/>
+        <location filename="../profile.c" line="1315"/>
         <source>In deco
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1293"/>
+        <location filename="../profile.c" line="1317"/>
         <source>NDL: %umin
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1305"/>
+        <location filename="../profile.c" line="1329"/>
         <source>In deco (calc)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1307"/>
+        <location filename="../profile.c" line="1331"/>
         <source>NDL: %umin (calc)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1310"/>
+        <location filename="../profile.c" line="1334"/>
         <source>TTS: %umin (calc)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1313"/>
+        <location filename="../profile.c" line="1337"/>
         <source>Calculated ceiling %.0f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1319"/>
+        <location filename="../profile.c" line="1343"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1325"/>
+        <location filename="../profile.c" line="1349"/>
         <source>heartbeat: %d
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1327"/>
+        <location filename="../profile.c" line="1351"/>
         <source>bearing: %d
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1419"/>
+        <location filename="../profile.c" line="1443"/>
         <source>%sT: %d:%02d min</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1435"/>
+        <location filename="../profile.c" line="1459"/>
         <source>%s %sD:%.1f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1439"/>
+        <location filename="../profile.c" line="1463"/>
         <source>%s%sV:%.2f%s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1454"/>
+        <location filename="../profile.c" line="1478"/>
         <source>%s %sP:%d %s</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="273"/>
+        <location filename="../qt-gui.cpp" line="281"/>
         <source>C</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>boat</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>shore</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>drift</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>deep</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>cavern</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>ice</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>wreck</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>cave</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>altitude</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>pool</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>lake</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>river</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>night</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>fresh</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>student</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>photo</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>video</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>instructor</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="25"/>
         <source>deco</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="133"/>
+        <source>ℓ</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="216"/>
+        <location filename="../statistics.c" line="214"/>
         <source>more than %d days</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="220"/>
         <source>%dd %dh %dmin</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="224"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dh %dmin</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="235"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="242"/>
+        <location filename="../statistics.c" line="240"/>
         <source>for selected dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="275"/>
         <source>for dive #%d</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for selected dive</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for all dives</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="283"/>
+        <location filename="../statistics.c" line="281"/>
         <source>(no dives)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sun</source>
         <translation>Pazar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Mon</source>
         <translation>Pazartesi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Tue</source>
         <translation>Salı</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Wed</source>
         <translation>Çarşamba</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Thu</source>
         <translation>Perşembe</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Fri</source>
         <translation>Cuma</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sat</source>
         <translation>Cumartesi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jan</source>
         <translation>Ocak</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Feb</source>
         <translation>Şubat</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Mar</source>
         <translation>Mart</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Apr</source>
         <translation>Nisan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>May</source>
         <translation>Mayıs</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jun</source>
         <translation>Haziran</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Jul</source>
         <translation>Temmuz</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Aug</source>
         <translation>Ağustos</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Sep</source>
         <translation>Eylül</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Oct</source>
         <translation>Ekim</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Nov</source>
         <translation>Kasım</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Dec</source>
         <translation>Aralık</translation>
     </message>
@@ -3786,205 +4185,414 @@ EADD: %d%s
         <source>Uemis Zurich: File System is almost full
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="25"/>
         <source>Uemis Zurich: File System is full
 Disconnect/reconnect the dive computer
 and try again</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="26"/>
         <source>Short write to req.txt file
 Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="107"/>
+        <location filename="../uemis-downloader.c" line="111"/>
         <source>unknown</source>
         <translation>bilinmeyen</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="399"/>
+        <location filename="../uemis-downloader.c" line="403"/>
         <source>data</source>
         <translation>veri</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>wetsuit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>semidry</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>drysuit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>shorty</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>vest</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>long john</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>jacket</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>full suit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="620"/>
+        <location filename="../uemis-downloader.c" line="624"/>
         <source>membrane</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="802"/>
+        <location filename="../uemis-downloader.c" line="823"/>
         <source>Init Communication</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="815"/>
+        <location filename="../uemis-downloader.c" line="836"/>
         <source>Start download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="196"/>
         <source>Safety Stop Violation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="198"/>
         <source>Speed Alarm</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="201"/>
         <source>Speed Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="203"/>
-        <source>PO2 Green Warning</source>
-        <translation type="unfinished"></translation>
+        <source>pO₂ Green Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
-        <source>PO2 Ascend Warning</source>
-        <translation type="unfinished"></translation>
+        <source>pO₂ Ascend Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="208"/>
-        <source>PO2 Ascend Alarm</source>
-        <translation type="unfinished"></translation>
+        <source>pO₂ Ascend Alarm</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
         <source>Tank Pressure Info</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="214"/>
         <source>RGT Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="216"/>
         <source>RGT Alert</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="218"/>
         <source>Tank Change Suggested</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="220"/>
         <source>Depth Limit Exceeded</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="222"/>
         <source>Max Deco Time Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="224"/>
         <source>Dive Time Info</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="226"/>
         <source>Dive Time Alert</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="228"/>
         <source>Marker</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="230"/>
         <source>No Tank Data</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="232"/>
         <source>Low Battery Warning</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="234"/>
         <source>Low Battery Alert</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="36"/>
+        <source>Date:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="38"/>
+        <source>Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="40"/>
+        <source>Duration:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="41"/>
+        <source>min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="43"/>
+        <source>Max Depth:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="46"/>
+        <source>Air Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="48"/>
+        <source>Water Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="50"/>
+        <source>Location:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="54"/>
+        <source>Notes:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>plannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="35"/>
+        <source>Rates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="56"/>
+        <source>Ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="77"/>
+        <source>below 75% avg. depth</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="94"/>
+        <source>75%-50% avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="111"/>
+        <source>50% avg. depth - 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="128"/>
+        <source>6m/20ft to surface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="148"/>
+        <source>Descent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="200"/>
+        <source>surface to the bottom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="226"/>
+        <source>Planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="247"/>
+        <source>GF low</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="264"/>
+        <source>GF high</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
+        <source>Drop to first depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
+        <source>Last Stop at 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>plan backgas breaks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="318"/>
+        <source>Gas Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <source>bottom SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="349"/>
+        <source>deco SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="359"/>
+        <source>bottom pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="389"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="382"/>
+        <source>deco pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="421"/>
+        <source>Dive Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+        <source>In dive plan, show runtime (absolute time) of stops</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="445"/>
+        <source>display runtime</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="458"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="461"/>
+        <source>display segment duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="471"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="474"/>
+        <source>display transitions in deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="481"/>
+        <source>verbatim diveplan</source>
+        <translation type="unfinished"/>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/subsurface_vi.ts b/translations/subsurface_vi.ts
index bf21cf558..cb13cbfff 100644
--- a/translations/subsurface_vi.ts
+++ b/translations/subsurface_vi.ts
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="vi" version="2.0">
+<defaultcodec>UTF-8</defaultcodec>
 <context>
     <name>CylindersModel</name>
     <message>
@@ -14,65 +15,65 @@
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
         <source>WorkPress</source>
-        <translation type="unfinished"/>
+        <translation>WorkPress</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
         <source>StartPress</source>
-        <translation type="unfinished"/>
+        <translation>StartPress</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
         <source>EndPress</source>
-        <translation type="unfinished"/>
+        <translation>EndPress</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
         <source>He%</source>
-        <translation type="unfinished"/>
+        <translation>Anh ấy%</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
         <source>O</source>
-        <translation type="unfinished"/>
+        <translation>O</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>Chuyển đổi tại</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>Click vào đây sẽ loại bỏ này xi lanh.</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"/>
     </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>Khí này hiện đang được sử dụng. Chỉ các xi lanh không được sử dụng khi lặn có thể được gỡ bỏ.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="507"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="508"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="527"/>
+        <location filename="../qt-ui/models.cpp" line="532"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="528"/>
+        <location filename="../qt-ui/models.cpp" line="533"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -87,225 +88,362 @@
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
         <source>Remove the selected Dive Computer?</source>
-        <translation type="unfinished"/>
+        <translation>Loại bỏ các Máy Lặn đã chọn?</translation>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
-        <translation type="unfinished"/>
+        <translation>Bạn có chắc bạn muốn
+bỏ các máy lặn đã được chọn?</translation>
     </message>
 </context>
 <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>Mô hình</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>Số hiệu Thiết Bị</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Nickname</source>
         <translation>Tên</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>Click vào đây sẽ loại bỏ thông tin về máy lặn này.</translation>
     </message>
 </context>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="90"/>
-        <source>air</source>
-        <translation>không khí</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="92"/>
-        <source>EAN%1</source>
-        <translation type="unfinished"/>
-    </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>Thoát đến OC</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>bắt đầu</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>kết thúc</translation>
     </message>
 </context>
 <context>
-    <name>DiveGasPressureItem</name>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="475"/>
-        <source>air</source>
-        <translation>không khí</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="476"/>
-        <source>EAN%1</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1258"/>
-        <source> l/min</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
-        <source> cuft/min</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <source>/min</source>
+        <translation>/nhỏ nhất</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>Hiển thị hộp tìm kiếm</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>mở rộng tất cả</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>thu gọn tất cả</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>thu gọn các phần khác</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>loại bỏ (các)máy lặn từ chuyến đi</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>tạo một cuộc lặn mới bên trên</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>thêm (các)chuyến đi lặn ngay lập tức ở trên</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <location filename="../qt-ui/divelistview.cpp" line="727"/>
         <source>add dive(s) to trip immediately below</source>
-        <translation type="unfinished"/>
+        <translation>thêm (các)chuyến đi lặn ngay lập tức ở dưới</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="749"/>
+        <location filename="../qt-ui/divelistview.cpp" line="731"/>
         <source>merge trip with trip above</source>
-        <translation type="unfinished"/>
+        <translation>kếp hợp chuyến đi này với chuyến đi bên trên</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>kếp hợp chuyến đi này với chuyến đi bên dưới</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>xóa (các)lần lặn</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>đánh dấu (các)lần lặn không hợp lệ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
-        <source>save As</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelistview.cpp" line="744"/>
+        <source>renumber dive(s)</source>
+        <translation>Chỉnh lại số thứ tự (các)lần lặn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="763"/>
-        <source>export As UDDF</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <source>shift times</source>
+        <translation>chuyển dịch thời gian</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="764"/>
-        <source>export As CSV</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <source>load images</source>
+        <translation>tải hình ảnh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="765"/>
-        <source>shift times</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Open Image Files</source>
+        <translation>Mở tập tin hình ảnh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="766"/>
-        <source>load images</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation>Tập tin dạng hình ảnh (thẻ *.jpeg *.pnm *.tif * .tiff)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="769"/>
-        <source>upload dive(s) to divelogs.de</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <source>merge selected dives</source>
+        <translation>hợp nhất các lần lặn được chọn</translation>
     </message>
+</context>
+<context>
+    <name>DiveLogExportDialog</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="795"/>
-        <source>Save Dives As...</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
+        <source>Export Dive Log Files</source>
+        <translation>Xuất dữ liệu về tập tin tổng kết các lần lặn</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="24"/>
+        <source>General Export</source>
+        <translation>Xuất dữ liệu tổng quát</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="30"/>
+        <source>Export format</source>
+        <translation>Định dạng của dữ liệu xuất</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="42"/>
+        <source>Subsurface XML</source>
+        <translation>Subsurface XML</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="61"/>
+        <source>UDDF</source>
+        <translation>UDDF</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="74"/>
+        <source>divelogs.de</source>
+        <translation>divelogs.de</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="84"/>
+        <source>CSV</source>
+        <translation>CSV</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="94"/>
+        <source>Worldmap</source>
+        <translation>Bản đồ thế giới</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="107"/>
+        <source>Selection</source>
+        <translation>Lựa chọn</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="116"/>
+        <source>Selected dives</source>
+        <translation>Các lần lặn đã được chọn</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="126"/>
+        <source>All dives</source>
+        <translation>Tất cả các lần lặn</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="178"/>
+        <source>HTML</source>
+        <translation>HTML</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="184"/>
+        <source>General Settings</source>
+        <translation>Thiết lập chung</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="190"/>
+        <source>Subsurface Numbers</source>
+        <translation>Số thứ tự Subsurface</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="203"/>
+        <source>Selected Dives</source>
+        <translation>Các lần lặn đã được chọn</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="216"/>
+        <source>Minimum Javascript</source>
+        <translation>Minimum Javascript</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="229"/>
+        <source>All Dives</source>
+        <translation>Tất cả các lần lặn</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="239"/>
+        <source>Export List only</source>
+        <translation>Chỉ xuất ra danh sách</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="252"/>
+        <source>Style Options</source>
+        <translation>Tùy chọn kiểu trang trí</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="264"/>
+        <source>Font</source>
+        <translation>Kiểu chữ</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="274"/>
+        <source>Font size</source>
+        <translation>Kích thước kiểu chữ</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
+        <source>8</source>
+        <translation>8</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <source>10</source>
+        <translation>10</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <source>12</source>
+        <translation>12</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <source>14</source>
+        <translation>14</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <source>16</source>
+        <translation>16</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="814"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <source>18</source>
+        <translation>18</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <source>20</source>
+        <translation>20</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="323"/>
+        <source>Theme</source>
+        <translation>Giao diện</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
+        <source>Light</source>
+        <translation>Sáng</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <source>Sand</source>
+        <translation>Cát</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="153"/>
         <source>Export UDDF File as</source>
-        <translation type="unfinished"/>
+        <translation>Xuất dữ liệu từ tập tin UDDF dưới dạng</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>UDDF files (*.uddf *.UDDF)</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>Xuất dữ liệu từ tập tin CSV dưới dạng</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>CSV files (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Open Image Files</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="162"/>
+        <source>Export World Map</source>
+        <translation>Xuất dữ liệu từ tập tin Bản đồ thế giới</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="163"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="177"/>
+        <source>HTML files (*.html)</source>
+        <translation>HTML files (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="760"/>
-        <source>merge selected dives</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="167"/>
+        <source>Export Subsurface XML</source>
+        <translation>Xuất dữ liệu dưới dạng Subsurface XML</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="168"/>
+        <source>XML files (*.xml *.ssrf)</source>
+        <translation>XML files (*.xml *.ssrf)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="176"/>
+        <source>Export HTML files as</source>
+        <translation>Xuất dữ liệu từ tập tin HTML dưới dạng</translation>
     </message>
 </context>
 <context>
@@ -313,141 +451,136 @@
     <message>
         <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
         <source>Import dive log file</source>
-        <translation type="unfinished"/>
+        <translation>Nhập dữ liệu từ tập tin ghi nhận các lần lặn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="36"/>
-        <source>Import CSV Dive Log Files</source>
-        <translation type="unfinished"/>
-    </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>Tùy chọn về CSV</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>Dấu ngăn cách dữ liệu</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>Chỉnh sửa trước khi nhập dữ liệu</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>Chỉnh sửa các mục thông tin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="80"/>
         <source>Depth</source>
         <translation>Độ sâu</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>Độ sâu giới hạn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="107"/>
         <source>PO2</source>
         <translation>PO2</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>Thời gian</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="121"/>
         <source>Temp</source>
         <translation>Nhiệt độ</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>Cns</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>Đơn vị</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>Số liệu</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="283"/>
         <source>Dive #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="317"/>
         <source>Date</source>
         <translation>Ngày tháng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="385"/>
         <source>Duration</source>
         <translation>Độ dài</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
         <source>Location</source>
         <translation>Địa điểm</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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="368"/>
         <source>Buddy</source>
         <translation>Bạn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="402"/>
         <source>Notes</source>
         <translation>Ghi chú</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="436"/>
         <source>Weight</source>
         <translation>Cân nặng</translation>
     </message>
@@ -455,104 +588,70 @@
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="71"/>
-        <source>Bottom SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="85"/>
-        <source>SAC on DECO Stop</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="78"/>
-        <source>GFHigh</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="98"/>
-        <source>GFLow</source>
+        <location filename="../qt-ui/diveplanner.ui" line="106"/>
+        <source>Planned Dive Time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="125"/>
-        <source>Last Stop at 6m</source>
+        <location filename="../qt-ui/diveplanner.ui" line="134"/>
+        <source>Altitude</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="174"/>
-        <source>Start Time</source>
-        <translation type="unfinished"/>
-    </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="116"/>
-        <source>30ft</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="363"/>
-        <source>Handler Position Error</source>
-        <translation type="unfinished"/>
-    </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>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/diveplanner.ui" line="158"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="445"/>
-        <source>AIR</source>
-        <translation>KHÔNG KHÍ</translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="137"/>
+        <source>unknown</source>
+        <translation>chưa rõ</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1152"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="590"/>
         <source>Duration</source>
         <translation>Độ dài</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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -560,17 +659,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"/>
     </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"/>
     </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"/>
     </message>
@@ -614,104 +713,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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>pO₂</source>
+        <translation type="unfinished"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
-        <source>PO2</source>
-        <translation>PO2</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <source>SAC</source>
+        <translation>SAC</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>#</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1298"/>
         <source>min</source>
         <translation>nhỏ nhất</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>kg</source>
         <translation>ký</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>lbs</source>
         <translation>lbs</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1310"/>
         <source>cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1344"/>
+        <location filename="../qt-ui/models.cpp" line="1325"/>
         <source>location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1316"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1338"/>
+        <location filename="../qt-ui/models.cpp" line="1319"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1341"/>
+        <location filename="../qt-ui/models.cpp" line="1322"/>
         <source>maxCNS</source>
         <translation>CNS tối đa</translation>
     </message>
@@ -719,114 +818,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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -834,54 +933,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"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="165"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/>
         <source>Error</source>
         <translation>Lỗi</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>Thử lại</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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="339"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -949,7 +1048,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"/>
     </message>
@@ -958,848 +1057,854 @@ 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>Ghi chú về lần lặn</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>Địa điểm</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="169"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
         <source>Divemaster</source>
         <translation>Người lặn giỏi nhất</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="155"/>
+        <location filename="../qt-ui/maintab.ui" line="148"/>
         <source>Buddy</source>
         <translation>Bạn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="63"/>
-        <source>Start time</source>
-        <translation type="unfinished"/>
-    </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="127"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="223"/>
         <source>Rating</source>
         <translation>Xếp hạng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="236"/>
         <source>Visibility</source>
         <translation>Tầm nhìn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="215"/>
+        <location filename="../qt-ui/maintab.ui" line="127"/>
         <source>Suit</source>
         <translation>Đồ lặn</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>Ghi chú</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="270"/>
+        <location filename="../qt-ui/maintab.ui" line="311"/>
         <source>Equipment</source>
         <translation>Dụng cụ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="350"/>
+        <location filename="../qt-ui/maintab.ui" line="391"/>
         <source>Dive Info</source>
         <translation>Thông tin lần lặn</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>Ngày tháng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="414"/>
+        <location filename="../qt-ui/maintab.ui" line="275"/>
+        <source>Time</source>
+        <translation>Thời gian</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="455"/>
         <source>Interval</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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>SAC</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="528"/>
+        <location filename="../qt-ui/maintab.ui" line="569"/>
         <source>OTU</source>
         <translation>OTU</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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="604"/>
+        <location filename="../qt-ui/maintab.ui" line="645"/>
         <source>Dive Time</source>
         <translation>Thời gian lặn</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="660"/>
+        <location filename="../qt-ui/maintab.ui" line="701"/>
         <source>Stats</source>
         <translation>Trạng thái</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="746"/>
         <source>Depth</source>
         <translation>Độ sâu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Temperature</source>
         <translation>Nhiệt độ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="784"/>
         <source>Duration</source>
         <translation>Độ dài</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Total Time</source>
         <translation>Tổng số thời gian</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="835"/>
         <source>Dives</source>
         <translation>Lần lặn</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="919"/>
+        <source>Photos</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="89"/>
         <source>Cylinders</source>
         <translation>Xilanh</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="93"/>
         <source>Weights</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="42"/>
+        <location filename="../qt-ui/maintab.cpp" line="48"/>
         <source>Save</source>
         <translation>Lưu lại</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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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>/nhỏ nhất</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="494"/>
+        <location filename="../qt-ui/maintab.cpp" line="464"/>
         <source>unknown</source>
         <translation>chưa rõ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>N</source>
-        <translation>N</translation>
+        <location filename="../qt-ui/maintab.cpp" line="501"/>
+        <source>Deepest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>S</source>
-        <translation>S</translation>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <source>Shallowest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>E</source>
-        <translation>E</translation>
+        <location filename="../qt-ui/maintab.cpp" line="794"/>
+        <source>Discard the Changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>W</source>
-        <translation>W</translation>
+        <location filename="../qt-ui/maintab.cpp" line="795"/>
+        <source>You are about to discard your changes.</source>
+        <translation type="unfinished"/>
     </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>Bộ lọc</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"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="583"/>
+        <source>Print</source>
+        <translation type="unfinished"/>
+    </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:'Courier'; 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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
         <source>&amp;Log</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="655"/>
+        <location filename="../qt-ui/mainwindow.ui" line="728"/>
         <source>New</source>
         <translation>Mới</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="666"/>
+        <location filename="../qt-ui/mainwindow.ui" line="739"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="677"/>
+        <location filename="../qt-ui/mainwindow.ui" line="750"/>
         <source>Save</source>
         <translation>Lưu lại</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"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>Save as</source>
         <translation>Lưu dưới dạng</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"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Close</source>
         <translation>Đóng lại</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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="806"/>
-        <source>Dive List</source>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <source>&amp;Print</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="814"/>
-        <source>Profile</source>
-        <translation>Hồ sơ</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="791"/>
+        <source>Ctrl+,</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="822"/>
-        <source>Info</source>
-        <translation>Thông tin</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="799"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="830"/>
-        <source>All</source>
+        <location filename="../qt-ui/mainwindow.ui" line="810"/>
+        <source>Import from &amp;dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="872"/>
-        <source>User &amp;Manual</source>
+        <location filename="../qt-ui/mainwindow.ui" line="818"/>
+        <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="880"/>
-        <source>Globe</source>
+        <location filename="../qt-ui/mainwindow.ui" line="821"/>
+        <source>Ctrl+G</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="888"/>
-        <source>P&amp;lan Dive</source>
+        <location filename="../qt-ui/mainwindow.ui" line="826"/>
+        <source>&amp;Edit Device Names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="891"/>
-        <source>Ctrl+L</source>
+        <location filename="../qt-ui/mainwindow.ui" line="834"/>
+        <source>Ctrl++</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="907"/>
-        <source>Import from Divelogs.de</source>
+        <location filename="../qt-ui/mainwindow.ui" line="839"/>
+        <source>&amp;Renumber</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
-        <source>&amp;Check for Updates</source>
+        <location filename="../qt-ui/mainwindow.ui" line="842"/>
+        <source>Ctrl+R</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="855"/>
+        <source>&amp;Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="858"/>
+        <source>Ctrl+Y</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="951"/>
-        <source>Export CSV</source>
+        <location filename="../qt-ui/mainwindow.ui" line="929"/>
+        <source>User &amp;Manual</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="945"/>
+        <source>P&amp;lan Dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="726"/>
+        <location filename="../qt-ui/mainwindow.ui" line="948"/>
+        <source>Ctrl+L</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1003"/>
+        <source>&amp;Check for Updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="783"/>
         <source>Ctrl+P</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="731"/>
-        <source>Preferences</source>
-        <translation>Tùy biến</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="774"/>
-        <source>Add Dive</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="793"/>
-        <source>Auto Group</source>
-        <translation type="unfinished"/>
-    </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="838"/>
-        <source>Prev DC</source>
-        <translation>DC trước</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="846"/>
-        <source>Next DC</source>
-        <translation>DC tiếp theo</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="854"/>
-        <source>Select Events</source>
-        <translation>Chọn sự kiện</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <location filename="../qt-ui/mainwindow.ui" line="916"/>
         <source>Input Plan</source>
         <translation>Nhập vào kế hoạch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="864"/>
-        <source>About Subsurface</source>
-        <translation>Thông tin</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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <location filename="../qt-ui/mainwindow.ui" line="978"/>
         <source>F11</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="174"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
         <source>Open File</source>
         <translation>Mở tập tin</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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="652"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="717"/>
         <source>Save Changes?</source>
         <translation>Lưu các thay đổi?</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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="280"/>
-        <source>Export UDDF File as</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="281"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="289"/>
-        <source>Export CSV File as</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="290"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="299"/>
-        <source>Export World Map</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="300"/>
-        <source>HTML files (*.html)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="449"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="514"/>
         <source>Yearly Statistics</source>
         <translation>Thống kê từng năm</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="961"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1076"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1199"/>
         <source>Open Dive Log File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1225"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>PlannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Last stop at 20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="416"/>
+        <source>Last stop at 6m</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>PreferencesDialog</name>
     <message>
         <location filename="../qt-ui/preferences.ui" line="85"/>
@@ -1822,247 +1927,297 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="141"/>
-        <source>Lists and Tables</source>
+        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <source>Network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
-        <source>Font</source>
+        <location filename="../qt-ui/preferences.ui" line="151"/>
+        <source>Lists and Tables</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="157"/>
+        <source>Font</source>
+        <translation>Kiểu chữ</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="167"/>
         <source>Font size</source>
-        <translation type="unfinished"/>
+        <translation>Kích thước kiểu chữ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="170"/>
+        <location filename="../qt-ui/preferences.ui" line="180"/>
         <source>Dives</source>
         <translation>Lần lặn</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="188"/>
+        <location filename="../qt-ui/preferences.ui" line="198"/>
         <source>...</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <location filename="../qt-ui/preferences.ui" line="247"/>
         <source>Animations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <location filename="../qt-ui/preferences.ui" line="253"/>
         <source>Speed</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="312"/>
+        <source>Reset all settings to their default value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
         <source>System</source>
         <translation type="unfinished"/>
     </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>Số liệu</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="343"/>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
         <source>Personalize</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="392"/>
         <source>Depth</source>
         <translation>Độ sâu</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="409"/>
         <source>feet</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="401"/>
+        <location filename="../qt-ui/preferences.ui" line="426"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="411"/>
+        <location filename="../qt-ui/preferences.ui" line="436"/>
         <source>psi</source>
         <translation>psi</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="455"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>celsius</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="465"/>
+        <location filename="../qt-ui/preferences.ui" line="490"/>
         <source>fahrenheit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="482"/>
+        <location filename="../qt-ui/preferences.ui" line="507"/>
         <source>kg</source>
         <translation>ký</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"/>
     </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"/>
     </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"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="817"/>
+        <source>Proxy type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="830"/>
+        <source>Host</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="856"/>
+        <source>Port</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="882"/>
+        <source>Requires authentication</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
+        <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="657"/>
+        <location filename="../qt-ui/preferences.ui" line="925"/>
+        <source>Password</source>
+        <translation>Mật khẩu</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="682"/>
         <source>draw dive computer reported ceiling red</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="767"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>Filter</source>
         <translation>Bộ lọc</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="419"/>
         <source>Pressure</source>
         <translation>Áp suất</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="448"/>
+        <location filename="../qt-ui/preferences.ui" line="473"/>
         <source>Temperature</source>
         <translation>Nhiệt độ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="475"/>
+        <location filename="../qt-ui/preferences.ui" line="500"/>
         <source>Weight</source>
         <translation>Cân nặng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="517"/>
         <source>lbs</source>
         <translation>lbs</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="520"/>
+        <location filename="../qt-ui/preferences.ui" line="545"/>
         <source>Minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="530"/>
+        <location filename="../qt-ui/preferences.ui" line="555"/>
         <source>Seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="562"/>
+        <location filename="../qt-ui/preferences.ui" line="587"/>
         <source>Show</source>
         <translation type="unfinished"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="693"/>
         <source>Show non-used cylinders in Equipment Tab</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="691"/>
+        <location filename="../qt-ui/preferences.ui" line="716"/>
         <source>Misc</source>
         <translation type="unfinished"/>
     </message>
@@ -2072,35 +2227,65 @@ Please, remove them first.</source>
         <translation>Tùy biến</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="739"/>
         <source>GFHigh</source>
         <translation type="unfinished"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="24"/>
+        <source>System proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="25"/>
+        <source>HTTP proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="26"/>
+        <source>SOCKS proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="245"/>
         <source>Restart required</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="394"/>
+        <source>Warning</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
 </context>
 <context>
     <name>PrintDialog</name>
@@ -2241,72 +2426,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>chưa rõ</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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1920"/>
+        <location filename="../qt-ui/models.cpp" line="1900"/>
         <source>SAC:</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1924"/>
+        <location filename="../qt-ui/models.cpp" line="1904"/>
         <source>Weights:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1929"/>
+        <location filename="../qt-ui/models.cpp" line="1909"/>
         <source>Notes:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1936"/>
+        <location filename="../qt-ui/models.cpp" line="1916"/>
         <source>Divemaster:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1938"/>
+        <location filename="../qt-ui/models.cpp" line="1918"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1940"/>
+        <location filename="../qt-ui/models.cpp" line="1920"/>
         <source>Suit:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1942"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>Viz:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1944"/>
+        <location filename="../qt-ui/models.cpp" line="1924"/>
         <source>Rating:</source>
         <translation type="unfinished"/>
     </message>
@@ -2314,62 +2499,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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/>
+        <source>Make first divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="906"/>
+        <source>Delete this divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="913"/>
         <source>Add Gas Change</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -2377,12 +2577,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>KHÔNG KHÍ</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"/>
     </message>
@@ -2392,22 +2592,22 @@ Please, remove them first.</source>
         <translation>Đóng lại</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="34"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation>Trung bình</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="37"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation>Nhỏ nhất</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="40"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation>Tối đa</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"/>
     </message>
@@ -2421,9 +2621,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>Số bắt đầu mới</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="126"/>
+        <source>New number</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchBar</name>
+    <message>
+        <location filename="../qt-ui/searchbar.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ShiftImageTimesDialog</name>
@@ -2438,44 +2652,49 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="105"/>
         <source>earlier</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="109"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="112"/>
         <source>later</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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>Tập tin dạng hình ảnh (thẻ *.jpeg *.pnm *.tif * .tiff)</translation>
     </message>
 </context>
 <context>
@@ -2553,42 +2772,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>Dịch vụ web</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/>
         <source>Connecting...</source>
         <translation>Đang kết nối...</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/>
         <source>Connection Error: </source>
         <translation>Lỗi kết nối:</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>Nhận dạng người dùng không hợp lệ!</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>Không nhận được trả lời!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/>
         <source>Download Success!</source>
         <translation>Tải về thành công!</translation>
     </message>
@@ -2604,17 +2823,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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2622,7 +2841,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"/>
     </message>
@@ -2630,42 +2849,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"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="37"/>
-        <source>&lt;h3&gt;Subsurface was unable to check for updates.&lt;/h3&gt;</source>
+        <location filename="../qt-ui/updatemanager.cpp" line="36"/>
+        <source>Subsurface was unable to check for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
-        <source>&lt;br/&gt;&lt;b&gt;The following error occurred:&lt;/b&gt;&lt;br/&gt;</source>
+        <location filename="../qt-ui/updatemanager.cpp" line="41"/>
+        <source>The following error occurred:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="43"/>
-        <source>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Please check your internet connection.&lt;/b&gt;</source>
+        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
+        <source>Please check your internet connection.</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -2673,25 +2892,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>Hướng dẫn sử dụng</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"/>
     </message>
 </context>
 <context>
+    <name>UserSurvey</name>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="47"/>
+        <source>Subsurface User Survey</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="79"/>
+        <source>Recreational DIver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="92"/>
+        <source>Tech Diver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="105"/>
+        <source>Interested in dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="118"/>
+        <source>I am downloading dives from supported dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="131"/>
+        <source>I am importing dives from other software / sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="144"/>
+        <source>I am manually entering dives</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="190"/>
+        <source>Please type suggestions (in English) in the following box</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="27"/>
+        <source>
+Operating System: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="30"/>
+        <source>
+CPU Architecture: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="35"/>
+        <source>
+OS CPU Architecture %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="39"/>
+        <source>
+Language: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="73"/>
+        <source>Should we ask you later?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="74"/>
+        <source>Don&apos;t ask me again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="75"/>
+        <source>Ask Later</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="76"/>
+        <source>Ask again?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <source>Submit User Survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <source>Subsurface was unable to submit the user survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="101"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="102"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="111"/>
+        <source>Survey successfully submitted.</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="723"/>
+        <location filename="../qt-ui/models.cpp" line="721"/>
         <source>kg</source>
         <translation>ký</translation>
     </message>
@@ -2739,12 +3096,12 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </message>
@@ -2752,37 +3109,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>Loại</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="368"/>
+        <location filename="../qt-ui/models.cpp" line="373"/>
         <source>Weight</source>
         <translation>Cân nặng</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="453"/>
+        <location filename="../qt-ui/models.cpp" line="458"/>
         <source>kg</source>
         <translation>ký</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="454"/>
+        <location filename="../qt-ui/models.cpp" line="459"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="478"/>
+        <location filename="../qt-ui/models.cpp" line="483"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="484"/>
         <source>m</source>
         <translation>m</translation>
     </message>
@@ -2790,70 +3147,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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>#</source>
         <translation>#</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>
 Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>
 Shortest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>
 Longest</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
@@ -2862,99 +3219,92 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="58"/>
+        <location filename="../dive.c" line="87"/>
         <source>pascal</source>
         <translation>pascal</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>bar</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>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="104"/>
-        <location filename="../qt-gui.cpp" line="292"/>
-        <source>l</source>
-        <translation>l</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>cuft</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>m</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>ft</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>lbs</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>ký</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1120"/>
+        <location filename="../dive.c" line="1237"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) hoặc (%s)</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>không khí</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="170"/>
+        <location filename="../equipment.c" line="210"/>
         <source>integrated</source>
         <translation>được tích hợp</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="171"/>
+        <location filename="../equipment.c" line="211"/>
         <source>belt</source>
         <translation>dây ràng</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="172"/>
+        <location filename="../equipment.c" line="212"/>
         <source>ankle</source>
         <translation>mắt cá chân</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="173"/>
+        <location filename="../equipment.c" line="213"/>
         <source>backplate weight</source>
         <translation>cân nặng giáp che</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="174"/>
+        <location filename="../equipment.c" line="214"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -2971,253 +3321,253 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>none</source>
         <translation>không</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>deco stop</source>
         <translation>dừng lại deco</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ascent</source>
         <translation>đường dốc</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ceiling</source>
         <translation>trần</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>workload</source>
         <translation>tải công việc</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>transmitter</source>
         <translation>máy phát radio</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>violation</source>
         <translation>độ xâm phạm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>bookmark</source>
         <translation>đánh dấu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>surface</source>
         <translation>bề mặt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>safety stop</source>
         <translation>dừng an toàn</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>thay đổi dưỡng khí</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (voluntary)</source>
         <translation>dừng an toàn (tự nguyện)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (mandatory)</source>
         <translation>dừng an toàn (bắt buộc)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>deepstop</source>
         <translation>deepstop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>ceiling (safety stop)</source>
         <translation>trần (độ an toàn)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>divetime</source>
         <translation>thời gian lặn</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"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>maxdepth</source>
         <translation>độ sâu tối đa</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>airtime</source>
         <translation>thời gian không khí</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>heading</source>
         <translation>thẳng tiến</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>tissue level warning</source>
         <translation>cảnh báo cấp độ mô</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>non stop time</source>
         <translation>không dừng lại thời gian</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="163"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>invalid event number</source>
         <translation>chỉ số sự kiện không hợp lệ</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>Không thể tạo việc chuyển thông số cho %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="411"/>
+        <location filename="../libdivecomputer.c" line="414"/>
         <source>Error registering the data</source>
         <translation>Lỗi khi đăng ký dữ liệu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="419"/>
+        <location filename="../libdivecomputer.c" line="422"/>
         <source>Error parsing the datetime</source>
         <translation>Lỗi khi chuyển thông số thời gian</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="438"/>
         <source>Dive %d: %s %d %04d</source>
         <translation>Lần lặn %d: %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="440"/>
+        <location filename="../libdivecomputer.c" line="443"/>
         <source>Error parsing the divetime</source>
         <translation>Lỗi khi chuyển thông số thời gian lặn</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="449"/>
+        <location filename="../libdivecomputer.c" line="452"/>
         <source>Error parsing the maxdepth</source>
         <translation>Lỗi khi chuyển thông số độ sâu tối đa</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="458"/>
+        <location filename="../libdivecomputer.c" line="461"/>
         <source>Error parsing the gas mix count</source>
         <translation>Lỗi khi chuyển tiếp thông số số lượng hỗn hợp dưỡng khí</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="470"/>
+        <location filename="../libdivecomputer.c" line="473"/>
         <source>Error obtaining water salinity</source>
         <translation>Lỗi khi thu nhận độ mặn của nước</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the gas mix</source>
         <translation>Lỗi khi chuyển thông số hỗn hợp dưỡng khí</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="493"/>
+        <location filename="../libdivecomputer.c" line="496"/>
         <source>Error parsing the samples</source>
         <translation>Lỗi khi chuyển thông số các mẫu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="623"/>
+        <location filename="../libdivecomputer.c" line="626"/>
         <source>Event: waiting for user action</source>
         <translation>Sự kiện: đang đợi thao tác từ người dùng</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="631"/>
+        <location filename="../libdivecomputer.c" line="634"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>mô hình=%u (0x%08x), firmware=%u (0x%08x), số hiệu=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="691"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the event handler.</source>
         <translation>Lỗi khi đăng ký quản lý sự kiện.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="696"/>
+        <location filename="../libdivecomputer.c" line="699"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Lỗi khi đăng ký việc hủy bỏ quản lý.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="717"/>
+        <location filename="../libdivecomputer.c" line="720"/>
         <source>Dive data import error</source>
         <translation>Lỗi khi nhập dữ liệu lặn</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="756"/>
+        <location filename="../libdivecomputer.c" line="759"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Không thể tạo nội dung cho thiết bị đo lặn</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="763"/>
+        <location filename="../libdivecomputer.c" line="766"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Không thể mở %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="462"/>
+        <location filename="../parse-xml.c" line="466"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Đang đọc tỉ lệ lạ %s
 </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>Thất bại khi chuyển thông số &apos;%s&apos;</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>Thất bại khi truy vấn việc nhận_sự kiện từ cơ sở dữ liệu.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1853"/>
+        <location filename="../parse-xml.c" line="1911"/>
         <source>Database query get_tags failed.
 </source>
         <translation type="unfinished"/>
@@ -3230,562 +3580,605 @@ Maximum</source>
 </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 '%s'.
 </source>
         <translation>Thất bại khi truy vấn dữ liệu &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1998"/>
+        <location filename="../parse-xml.c" line="2056"/>
         <source>Database query get_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="146"/>
-        <location filename="../planner.c" line="617"/>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation>Không tìm thấy dưỡng khí %d%d</translation>
+        <location filename="../planner.c" line="159"/>
+        <location filename="../planner.c" line="752"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="308"/>
+        <location filename="../planner.c" line="345"/>
         <source>Too many gas mixes</source>
         <translation>Quá nhiều dưỡng khí được trộn</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="489"/>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation>%s
-Kế hoạch lặn dưới bề mặt
-dựa trên GFlow = %.0f và GFhigh = %.0f
-
-</translation>
+        <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>THẬN TRỌNG / CẢNH BÁO: ĐÂY LÀ PHẦN HOÀN THIỆN MỚI CỦA THUẬT TOÁN BUHLMANN VÀ DỰ TOÁN VỀ VIỆC LẶN DỰA TRÊN CÁC THÔNG SỐ NHẬN ĐƯỢC TỪ MỘT SỐ HỮU HẠN CÁC CUỘC THỬ NGHIỆM. CHÚNG TÔI MẠNH MẼ KHUYẾN CÁO BẠN KHÔNG NÊN HOÀN TOÀN DỰA VÀO CÁC THÔNG SỐ NÀY.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="530"/>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Chuyển đến %.*f %s trong %d:%02d phút - thời gian chạy %d:%02u tại %s
-</translation>
+        <location filename="../planner.c" line="535"/>
+        <source>based on GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="539"/>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>Ở %.*f %s đối với %d:%02d phút - thời gian chạy %d:%02u ở %s
-</translation>
+        <location filename="../planner.c" line="538"/>
+        <source>Subsurface dive plan</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="550"/>
-        <source>Switch gas to %s
-</source>
-        <translation>Chuyển dưỡng khí sang %s
-</translation>
+        <location filename="../planner.c" line="542"/>
+        <source>depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="558"/>
-        <source>Gas consumption:
-</source>
-        <translation>Dưỡng khí tiêu thụ:
-</translation>
+        <location filename="../planner.c" line="545"/>
+        <source>runtime</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="569"/>
-        <source>%.0f%s of %s
-</source>
-        <translation>%.0f%s of %s
-</translation>
+        <location filename="../planner.c" line="548"/>
+        <source>duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="551"/>
+        <source>gas</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="606"/>
+        <source>%3.0f%s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
+        <source>%3dmin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="629"/>
+        <source>Switch gas to %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="638"/>
+        <source>Gas consumption:</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="659"/>
+        <source>this is more gas than available in the specified cylinder!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="664"/>
+        <source>not enough reserve for gas sharing on ascent!</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="668"/>
+        <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
+        <translation type="unfinished"/>
+    </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"/>
     </message>
     <message>
-        <location filename="../planner.c" line="810"/>
+        <location filename="../planner.c" line="980"/>
         <source>ean</source>
         <translation>ean</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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1229"/>
+        <location filename="../profile.c" line="1253"/>
         <source>P: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1233"/>
+        <location filename="../profile.c" line="1257"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1263"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1244"/>
+        <location filename="../profile.c" line="1268"/>
         <source>CNS: %u%%
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1246"/>
+        <location filename="../profile.c" line="1270"/>
         <source>pO%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1272"/>
         <source>pN%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="1274"/>
         <source>pHe: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="1277"/>
         <source>MOD: %d%s
 </source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1276"/>
+        <location filename="../profile.c" line="1300"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1279"/>
+        <location filename="../profile.c" line="1303"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="1308"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1287"/>
+        <location filename="../profile.c" line="1311"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1291"/>
+        <location filename="../profile.c" line="1315"/>
         <source>In deco
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1293"/>
+        <location filename="../profile.c" line="1317"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1297"/>
+        <location filename="../profile.c" line="1321"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1305"/>
+        <location filename="../profile.c" line="1329"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1307"/>
+        <location filename="../profile.c" line="1331"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1310"/>
+        <location filename="../profile.c" line="1334"/>
         <source>TTS: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1313"/>
+        <location filename="../profile.c" line="1337"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1319"/>
+        <location filename="../profile.c" line="1343"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1325"/>
+        <location filename="../profile.c" line="1349"/>
         <source>heartbeat: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1327"/>
+        <location filename="../profile.c" line="1351"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1419"/>
+        <location filename="../profile.c" line="1443"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1435"/>
+        <location filename="../profile.c" line="1459"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1439"/>
+        <location filename="../profile.c" line="1463"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1454"/>
+        <location filename="../profile.c" line="1478"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="273"/>
+        <location filename="../qt-gui.cpp" line="281"/>
         <source>C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="276"/>
+        <location filename="../qt-gui.cpp" line="284"/>
         <source>F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="392"/>
-        <source>%1, %2 %3, %4 %5:%6</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="405"/>
-        <source>%1 %2, %3
-%4:%5</source>
-        <translation type="unfinished"/>
-    </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>boat</source>
         <translation>thuyền</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>shore</source>
         <translation>bờ biển</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>drift</source>
         <translation>độ trôi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>deep</source>
         <translation>sâu</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>cavern</source>
         <translation>hang lớn</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>ice</source>
         <translation>băng</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>wreck</source>
         <translation>vật trôi dạt</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>cave</source>
         <translation>hang động</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>altitude</source>
         <translation>độ cao so với mặt biển</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>pool</source>
         <translation>ao</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>lake</source>
         <translation>hồ</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>river</source>
         <translation>sông</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>night</source>
         <translation>ban đêm</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>fresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>student</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>photo</source>
         <translation>hình ảnh</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>video</source>
         <translation>video</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>instructor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="25"/>
         <source>deco</source>
         <translation>deco</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="216"/>
+        <location filename="../dive.c" line="133"/>
+        <source>ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="214"/>
         <source>more than %d days</source>
         <translation>đã hơn %d ngày</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="220"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="224"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="235"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation>cho các lần lặn #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="242"/>
+        <location filename="../statistics.c" line="240"/>
         <source>for selected dives</source>
         <translation>cho các lần lặn được chọn</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="275"/>
         <source>for dive #%d</source>
         <translation>cho lần lặn #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for selected dive</source>
         <translation>cho lần lặn được chọn</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for all dives</source>
         <translation>cho mọi lần lặn</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="283"/>
+        <location filename="../statistics.c" line="281"/>
         <source>(no dives)</source>
         <translation>(không có cuộc lặn nào)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sun</source>
         <translation>CN</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Mon</source>
         <translation>T2</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Tue</source>
         <translation>T3</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Wed</source>
         <translation>T4</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Thu</source>
         <translation>T5</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Fri</source>
         <translation>T6</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sat</source>
         <translation>T7</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jan</source>
         <translation>Th1</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Feb</source>
         <translation>Th2</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Mar</source>
         <translation>Th3</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>May</source>
         <translation>Th5</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jun</source>
         <translation>Th6</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Jul</source>
         <translation>Th7</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Aug</source>
         <translation>Th8</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Sep</source>
         <translation>Th9</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Oct</source>
         <translation>Th10</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Nov</source>
         <translation>Th11</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Dec</source>
         <translation>Th12</translation>
     </message>
@@ -3815,97 +4208,97 @@ Is the Uemis Zurich plugged in correctly?</source>
 Uemis Zurich đã được gắn vào đúng cách chưa?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="107"/>
+        <location filename="../uemis-downloader.c" line="111"/>
         <source>unknown</source>
         <translation>chưa rõ</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="379"/>
+        <location filename="../uemis-downloader.c" line="383"/>
         <source>Reading %s %s</source>
         <translation>Đang đọc %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="399"/>
+        <location filename="../uemis-downloader.c" line="403"/>
         <source>data</source>
         <translation>dữ liệu</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="420"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>divelog entry id</source>
         <translation>số dòng nhật trình lặn</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="422"/>
+        <location filename="../uemis-downloader.c" line="426"/>
         <source>divespot data id</source>
         <translation>số dữ liệu điểm lặn</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
+        <location filename="../uemis-downloader.c" line="428"/>
         <source>more data dive id</source>
         <translation>thêm dữ liệu về chỉ số lần lặn</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>wetsuit</source>
         <translation>wetsuit</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>semidry</source>
         <translation>ít ướt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>drysuit</source>
         <translation>đồ khô</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>shorty</source>
         <translation>ngắn</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>vest</source>
         <translation>áo khoác</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>long john</source>
         <translation>long john</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>jacket</source>
         <translation>jacket</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>full suit</source>
         <translation>thiết bị đầy đủ</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>2 pcs full suit</source>
         <translation>2 bộ pcs đầy đủ</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="620"/>
+        <location filename="../uemis-downloader.c" line="624"/>
         <source>membrane</source>
         <translation>lớp màng</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="802"/>
+        <location filename="../uemis-downloader.c" line="823"/>
         <source>Init Communication</source>
         <translation>Thiết lập giao tiếp</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="804"/>
+        <location filename="../uemis-downloader.c" line="825"/>
         <source>Uemis init failed</source>
         <translation>Thất bại cho việc thiết lập Uemis</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="815"/>
+        <location filename="../uemis-downloader.c" line="836"/>
         <source>Start download</source>
         <translation>Bắt đầu tải xuống</translation>
     </message>
@@ -3926,18 +4319,18 @@ Uemis Zurich đã được gắn vào đúng cách chưa?</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="203"/>
-        <source>PO2 Green Warning</source>
-        <translation>Cảnh báo PO2 xanh</translation>
+        <source>pO₂ Green Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
-        <source>PO2 Ascend Warning</source>
-        <translation>Cảnh báo PO2 cao</translation>
+        <source>pO₂ Ascend Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="208"/>
-        <source>PO2 Ascend Alarm</source>
-        <translation>Cảnh báo PO2 cao</translation>
+        <source>pO₂ Ascend Alarm</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
@@ -3999,5 +4392,214 @@ Uemis Zurich đã được gắn vào đúng cách chưa?</translation>
         <source>Low Battery Alert</source>
         <translation>Cảnh báo năng lượng yếu</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"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="36"/>
+        <source>Date:</source>
+        <translation>Ngày tháng:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="38"/>
+        <source>Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="40"/>
+        <source>Duration:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="41"/>
+        <source>min</source>
+        <translation>nhỏ nhất</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="43"/>
+        <source>Max Depth:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="46"/>
+        <source>Air Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="48"/>
+        <source>Water Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="50"/>
+        <source>Location:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="54"/>
+        <source>Notes:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>plannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="35"/>
+        <source>Rates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="56"/>
+        <source>Ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="77"/>
+        <source>below 75% avg. depth</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="94"/>
+        <source>75%-50% avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="111"/>
+        <source>50% avg. depth - 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="128"/>
+        <source>6m/20ft to surface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="148"/>
+        <source>Descent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="200"/>
+        <source>surface to the bottom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="226"/>
+        <source>Planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="247"/>
+        <source>GF low</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="264"/>
+        <source>GF high</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
+        <source>Drop to first depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
+        <source>Last Stop at 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>plan backgas breaks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="318"/>
+        <source>Gas Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <source>bottom SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="349"/>
+        <source>deco SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="359"/>
+        <source>bottom pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="389"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="382"/>
+        <source>deco pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="421"/>
+        <source>Dive Notes</source>
+        <translation>Ghi chú về lần lặn</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="445"/>
+        <source>display runtime</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="458"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="461"/>
+        <source>display segment duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="471"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="474"/>
+        <source>display transitions in deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="481"/>
+        <source>verbatim diveplan</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_zh_TW.ts b/translations/subsurface_zh_TW.ts
index 713e57ed8..c3fca94b2 100644
--- a/translations/subsurface_zh_TW.ts
+++ b/translations/subsurface_zh_TW.ts
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="zh_TW">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_TW" version="2.0">
+<defaultcodec>UTF-8</defaultcodec>
 <context>
     <name>CylindersModel</name>
     <message>
@@ -39,42 +38,42 @@
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="71"/>
+        <location filename="../qt-ui/models.cpp" line="70"/>
         <source>Switch at</source>
         <translation>交換於</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>於此處按下將移除此氣瓶.</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>氣瓶無法移除</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>此為使用氣體. 只有在潛水時, 未使用的氣體才可以被移除.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="502"/>
+        <location filename="../qt-ui/models.cpp" line="507"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="503"/>
+        <location filename="../qt-ui/models.cpp" line="508"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="527"/>
+        <location filename="../qt-ui/models.cpp" line="532"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="528"/>
+        <location filename="../qt-ui/models.cpp" line="533"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -102,22 +101,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>型號</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Device ID</source>
         <translation>裝置 ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1430"/>
+        <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Nickname</source>
         <translation>別名</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>於此處按下將會移除此潛水電腦.</translation>
     </message>
@@ -125,190 +124,326 @@
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="90"/>
-        <source>air</source>
-        <translation>air</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="92"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</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>跳脫至 OC</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>開始</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>結束</translation>
     </message>
 </context>
 <context>
-    <name>DiveGasPressureItem</name>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="475"/>
-        <source>air</source>
-        <translation>air</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveprofileitem.cpp" line="476"/>
-        <source>EAN%1</source>
-        <translation>EAN%1</translation>
-    </message>
-</context>
-<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1258"/>
-        <source> l/min</source>
-        <translation>l/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
-        <source> cuft/min</source>
-        <translation>cuft/min</translation>
+        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <source>/min</source>
+        <translation>/min</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>顯示搜尋盒</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="706"/>
         <source>expand all</source>
         <translation>全部展開</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="740"/>
+        <location filename="../qt-ui/divelistview.cpp" line="707"/>
         <source>collapse all</source>
         <translation>全部摺疊</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="741"/>
+        <location filename="../qt-ui/divelistview.cpp" line="708"/>
         <source>collapse others</source>
         <translation>摺疊其它</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>自旅程中移除潛水 (多筆)</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>於上方新增旅程</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>新增潛水 (所選) 至旅程上方.</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>
+        <translation type="unfinished"/>
     </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>與上方旅程合併</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>與下方旅程合併</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>刪除潛水 (所選)</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>標示無效的潛水 (所選)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
-        <source>save As</source>
-        <translation>另存為</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="763"/>
-        <source>export As UDDF</source>
-        <translation>匯出成 UDDF </translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="764"/>
-        <source>export As CSV</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/divelistview.cpp" line="744"/>
+        <source>renumber dive(s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="765"/>
+        <location filename="../qt-ui/divelistview.cpp" line="745"/>
         <source>shift times</source>
         <translation>移動時間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="766"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>load images</source>
         <translation>載入圖片</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="769"/>
-        <source>upload dive(s) to divelogs.de</source>
-        <translation>上傳潛水 (所選) 至 divelogs.de</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Open Image Files</source>
+        <translation>打開圖片文件</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="795"/>
-        <source>Save Dives As...</source>
-        <translation>儲存潛水為...</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="767"/>
+        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+        <translation>圖片文件類型(*.jpg*.jpeg*.pnm*.tif*.tiff)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <source>merge selected dives</source>
+        <translation>合併所選擇的潛水</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="814"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="24"/>
+        <source>General Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="30"/>
+        <source>Export format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="42"/>
+        <source>Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="61"/>
+        <source>UDDF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="74"/>
+        <source>divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="84"/>
+        <source>CSV</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="94"/>
+        <source>Worldmap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="107"/>
+        <source>Selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="116"/>
+        <source>Selected dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="126"/>
+        <source>All dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="178"/>
+        <source>HTML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="184"/>
+        <source>General Settings</source>
+        <translation>一般設定</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="190"/>
+        <source>Subsurface Numbers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="203"/>
+        <source>Selected Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="216"/>
+        <source>Minimum Javascript</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="229"/>
+        <source>All Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="239"/>
+        <source>Export List only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="252"/>
+        <source>Style Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="264"/>
+        <source>Font</source>
+        <translation>字型</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="274"/>
+        <source>Font size</source>
+        <translation>字體大小</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
+        <source>8</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <source>10</source>
+        <translation>10</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <source>12</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <source>14</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <source>16</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <source>18</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <source>20</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="323"/>
+        <source>Theme</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <source>Sand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="153"/>
         <source>Export UDDF File as</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>UDDF 檔案 (*.uddf *.UDDF)</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Open Image Files</source>
-        <translation>打開圖片文件</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="162"/>
+        <source>Export World Map</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="843"/>
-        <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
-        <translation>圖片文件類型(*.jpg*.jpeg*.pnm*.tif*.tiff)</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="163"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="177"/>
+        <source>HTML files (*.html)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="760"/>
-        <source>merge selected dives</source>
-        <translation>合併所選擇的潛水</translation>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="167"/>
+        <source>Export Subsurface XML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="168"/>
+        <source>XML files (*.xml *.ssrf)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="176"/>
+        <source>Export HTML files as</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -319,138 +454,133 @@
         <translation>載入潛水檔案</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="36"/>
-        <source>Import CSV Dive Log Files</source>
-        <translation>載入CVS格式潛水檔案</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="50"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
         <source>CSV options</source>
         <translation>CSV選項</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>欄位分隔線</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>未設定前的匯入</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>欄位設定</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="80"/>
         <source>Depth</source>
         <translation>深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="100"/>
         <source>Stopdepth</source>
         <translation>停留深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="107"/>
         <source>PO2</source>
         <translation>PO2</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>時間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="121"/>
         <source>Temp</source>
         <translation>溫度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="151"/>
         <source>Cns</source>
         <translation>Cns</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>單位</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>公制</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>英制</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="248"/>
         <source>Manual dives</source>
         <translation>手動潛水</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="283"/>
         <source>Dive #</source>
         <translation>潛水號#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="317"/>
         <source>Date</source>
         <translation>日期</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="385"/>
         <source>Duration</source>
         <translation>區間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="470"/>
         <source>Tags</source>
         <translation>標籤</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
         <source>Location</source>
         <translation>位置</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="453"/>
         <source>Gps</source>
         <translation>GPS定位</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="300"/>
         <source>Max depth</source>
         <translation>最大深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="334"/>
         <source>Mean depth</source>
         <translation>平均深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="368"/>
         <source>Buddy</source>
         <translation>潛伴</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="402"/>
         <source>Notes</source>
         <translation>記錄</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="436"/>
         <source>Weight</source>
         <translation>重量</translation>
     </message>
@@ -458,105 +588,70 @@
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="71"/>
-        <source>Bottom SAC</source>
-        <translation>水底耗氣率</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="106"/>
+        <source>Planned Dive Time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="85"/>
-        <source>SAC on DECO Stop</source>
-        <translation>減壓停留耗氣率</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="134"/>
+        <source>Altitude</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="78"/>
-        <source>GFHigh</source>
-        <translation>GFhigh</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="98"/>
-        <source>GFLow</source>
-        <translation>GFlow</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="125"/>
-        <source>Last Stop at 6m</source>
-        <translation>最後於 6 米停留</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="174"/>
-        <source>Start Time</source>
-        <translation>開始時間</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="181"/>
+        <location filename="../qt-ui/diveplanner.ui" line="141"/>
         <source>ATM Pressure</source>
         <translation>大氣壓力</translation>
     </message>
-</context>
-<context>
-    <name>DivePlannerGraphics</name>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="114"/>
-        <source>10m</source>
-        <translation>10m</translation>
-    </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="116"/>
-        <source>30ft</source>
-        <translation>30ft</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="148"/>
+        <source>mbar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="363"/>
-        <source>Handler Position Error</source>
-        <translation>程式位置錯誤</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>
-        <translation>在這次流程, 有一或多個停留將會被跳過, 
-請預先移除它們.</translation>
+        <location filename="../qt-ui/diveplanner.ui" line="158"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
 </context>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="445"/>
-        <source>AIR</source>
-        <translation>空氣</translation>
+        <location filename="../qt-ui/diveplanner.cpp" line="137"/>
+        <source>unknown</source>
+        <translation>未知</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1148"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="586"/>
         <source>Final Depth</source>
         <translation>最後深度</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1152"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="590"/>
         <source>Duration</source>
         <translation>區間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1154"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="592"/>
         <source>Used Gas</source>
         <translation>已使用的氣體</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>密閉式循環設定點</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>取消這次計畫?</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>您將要放棄你的計劃.</translation>
     </message>
@@ -564,17 +659,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>潛水計畫指示</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="954"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="256"/>
         <source>Available Gases</source>
         <translation>可用氣瓶</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>新增潛水資料點</translation>
     </message>
@@ -618,8 +713,23 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
-        <source>Pressure  S</source>
-        <translation>壓力S</translation>
+        <source>Pressure S</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <source>pN₂</source>
+        <translation>pN₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <source>pHe</source>
+        <translation>pHe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
@@ -636,86 +746,71 @@ Please, remove them first.</source>
         <source>SAC</source>
         <translation>耗氣率</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
-        <source>PN2</source>
-        <translation>PN2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
-        <source>PHE</source>
-        <translation>PHE</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
-        <source>PO2</source>
-        <translation>PO2</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>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>date</source>
         <translation>日期</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1295"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1298"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1323"/>
+        <location filename="../qt-ui/models.cpp" line="1304"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
+        <location filename="../qt-ui/models.cpp" line="1307"/>
         <source>suit</source>
         <translation>防寒衣</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1310"/>
         <source>cyl</source>
         <translation>氣瓶</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1344"/>
+        <location filename="../qt-ui/models.cpp" line="1325"/>
         <source>location</source>
         <translation>位置</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1316"/>
         <source>SAC</source>
         <translation>耗氣率</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1338"/>
+        <location filename="../qt-ui/models.cpp" line="1319"/>
         <source>OTU</source>
         <translation>氧容許量 OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1341"/>
+        <location filename="../qt-ui/models.cpp" line="1322"/>
         <source>maxCNS</source>
         <translation>最大 CNS</translation>
     </message>
@@ -723,115 +818,115 @@ 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>主機回傳不正確的回應.</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>預期的 XML 標籤 &apos;DiveDateReader&apos;, 取代了 &apos;%1</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>無法找到預期的 XML 標籤 &apos;DiveDates&apos;</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>異常的 XML 回應. 第 %1 行: %2</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>未選取任何潛水</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="181"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="179"/>
         <source>internal error</source>
         <translation>內部錯誤</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>完成</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>上傳潛水列表...</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>下載潛水列表...</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>下載 %1 潛水...</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>下載結束 - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
         <source>Corrupted download</source>
         <translation>中斷下載</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>此存檔無法被開啟:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Upload failed</source>
         <translation>上傳失敗</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="849"/>
         <source>Upload successful</source>
         <translation>上傳成功</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="854"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="852"/>
         <source>Login failed</source>
         <translation>登入失敗</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>回覆無法解析</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="868"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Error: %1</source>
         <translation>錯誤: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="835"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/>
         <source>Upload finished</source>
         <translation>上傳結束</translation>
     </message>
@@ -839,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>確認</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="165"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="163"/>
         <source>Error</source>
         <translation>錯誤</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>重試</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>搜索Uemis潛水設備</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>選擇記錄檔供潛水電腦下載日誌檔</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>記錄檔 (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="339"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
         <source>Warning</source>
         <translation>提醒</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>儲存潛水電腦傾印資訊並不會下載潛水記錄</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>選擇檔案供潛水電腦記錄傾印資訊</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>傾印檔 (*bin)</translation>
     </message>
@@ -954,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>編輯所選擇的潛水位置</translation>
     </message>
@@ -963,848 +1058,854 @@ 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>潛水記錄</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>位置</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="148"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Coordinates</source>
         <translation>座標</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="169"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
         <source>Divemaster</source>
         <translation>導潛</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="155"/>
+        <location filename="../qt-ui/maintab.ui" line="148"/>
         <source>Buddy</source>
         <translation>潛伴</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="63"/>
-        <source>Start time</source>
-        <translation>開始時間</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>氣溫</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>水溫</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="127"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Tags</source>
         <translation>標籤</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="192"/>
+        <location filename="../qt-ui/maintab.ui" line="223"/>
         <source>Rating</source>
         <translation>評分</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="236"/>
         <source>Visibility</source>
         <translation>能見度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="215"/>
+        <location filename="../qt-ui/maintab.ui" line="127"/>
         <source>Suit</source>
         <translation>防寒衣</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>記錄</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="270"/>
+        <location filename="../qt-ui/maintab.ui" line="311"/>
         <source>Equipment</source>
         <translation>裝備</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="350"/>
+        <location filename="../qt-ui/maintab.ui" line="391"/>
         <source>Dive Info</source>
         <translation>潛水資訊</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>日期</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="414"/>
+        <location filename="../qt-ui/maintab.ui" line="275"/>
+        <source>Time</source>
+        <translation>時間</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="455"/>
         <source>Interval</source>
         <translation>水面休息時間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="433"/>
+        <location filename="../qt-ui/maintab.ui" line="474"/>
         <source>Gases Used</source>
         <translation>使用氣體</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="452"/>
+        <location filename="../qt-ui/maintab.ui" line="493"/>
         <source>Gas Consumed</source>
         <translation>氣體消耗</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>耗氣率</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="531"/>
         <source>Max. Depth</source>
         <translation>最大深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="509"/>
+        <location filename="../qt-ui/maintab.ui" line="550"/>
         <source>Ave. Depth</source>
         <translation>平均深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="528"/>
+        <location filename="../qt-ui/maintab.ui" line="569"/>
         <source>OTU</source>
         <translation>氧容許量 OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="547"/>
+        <location filename="../qt-ui/maintab.ui" line="588"/>
         <source>Air Pressure</source>
         <translation>氣壓</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="566"/>
+        <location filename="../qt-ui/maintab.ui" line="607"/>
         <source>Air Temperature</source>
         <translation>氣溫</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="585"/>
+        <location filename="../qt-ui/maintab.ui" line="626"/>
         <source>Water Temperature</source>
         <translation>水溫</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="604"/>
+        <location filename="../qt-ui/maintab.ui" line="645"/>
         <source>Dive Time</source>
         <translation>潛水時間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="623"/>
+        <location filename="../qt-ui/maintab.ui" line="664"/>
         <source>Salinity</source>
         <translation>鹽度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="660"/>
+        <location filename="../qt-ui/maintab.ui" line="701"/>
         <source>Stats</source>
         <translation>統計</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="746"/>
         <source>Depth</source>
         <translation>深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="717"/>
+        <location filename="../qt-ui/maintab.ui" line="758"/>
         <source>Temperature</source>
         <translation>溫度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../qt-ui/maintab.ui" line="784"/>
         <source>Duration</source>
         <translation>區間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="753"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Total Time</source>
         <translation>全部時間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="772"/>
+        <location filename="../qt-ui/maintab.ui" line="835"/>
         <source>Dives</source>
         <translation>潛水</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="919"/>
+        <source>Photos</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="89"/>
         <source>Cylinders</source>
         <translation>氣瓶</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="90"/>
         <source>Add Cylinder</source>
         <translation>新增氣瓶</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="93"/>
         <source>Weights</source>
         <translation>配重</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>增加配重系統</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="438"/>
+        <location filename="../qt-ui/maintab.cpp" line="409"/>
         <source>Trip Location</source>
         <translation>旅程位置</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>旅程記錄</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="42"/>
+        <location filename="../qt-ui/maintab.cpp" line="48"/>
         <source>Save</source>
         <translation>儲存</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="46"/>
+        <location filename="../qt-ui/maintab.cpp" line="52"/>
         <source>Cancel</source>
         <translation>取消</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>此旅程已被編輯.</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>此些旅程已被編輯.</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>此潛水已被編輯.</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>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="494"/>
+        <location filename="../qt-ui/maintab.cpp" line="464"/>
         <source>unknown</source>
         <translation>未知</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>N</source>
-        <translation>N</translation>
+        <location filename="../qt-ui/maintab.cpp" line="501"/>
+        <source>Deepest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1054"/>
-        <source>S</source>
-        <translation>S</translation>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <source>Shallowest Dive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>E</source>
-        <translation>E</translation>
+        <location filename="../qt-ui/maintab.cpp" line="794"/>
+        <source>Discard the Changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1055"/>
-        <source>W</source>
-        <translation>W</translation>
+        <location filename="../qt-ui/maintab.cpp" line="795"/>
+        <source>You are about to discard your changes.</source>
+        <translation type="unfinished"/>
     </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>篩選器</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="571"/>
+        <location filename="../qt-ui/mainwindow.ui" line="646"/>
         <source>&amp;File</source>
         <translation>檔案</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="583"/>
+        <source>Print</source>
+        <translation>列印</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:'Courier'; 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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="667"/>
         <source>&amp;Log</source>
         <translation>日誌</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="606"/>
+        <location filename="../qt-ui/mainwindow.ui" line="679"/>
         <source>&amp;View</source>
         <translation>檢視</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="628"/>
+        <location filename="../qt-ui/mainwindow.ui" line="701"/>
         <source>&amp;Help</source>
         <translation>幫助</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="636"/>
+        <location filename="../qt-ui/mainwindow.ui" line="709"/>
         <source>&amp;Import</source>
         <translation>匯入</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>建立新日誌</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="655"/>
+        <location filename="../qt-ui/mainwindow.ui" line="728"/>
         <source>New</source>
         <translation>建立</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="658"/>
+        <location filename="../qt-ui/mainwindow.ui" line="731"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</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>開啟日誌</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="666"/>
+        <location filename="../qt-ui/mainwindow.ui" line="739"/>
         <source>Open</source>
         <translation>開啟</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <location filename="../qt-ui/mainwindow.ui" line="742"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="674"/>
+        <location filename="../qt-ui/mainwindow.ui" line="747"/>
         <source>&amp;Save</source>
         <translation>儲存</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="677"/>
+        <location filename="../qt-ui/mainwindow.ui" line="750"/>
         <source>Save</source>
         <translation>儲存</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="680"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="761"/>
         <source>Save as</source>
         <translation>另存為</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>Ctrl+Shift+S</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>關閉</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="772"/>
         <source>Close</source>
         <translation>關閉</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="702"/>
+        <location filename="../qt-ui/mainwindow.ui" line="775"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="902"/>
+        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <source>P&amp;references</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="831"/>
+        <source>&amp;Add Dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <source>Auto &amp;Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="863"/>
+        <source>&amp;Dive List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="871"/>
+        <source>&amp;Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="879"/>
+        <source>&amp;Info</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="887"/>
+        <source>&amp;All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="895"/>
+        <source>P&amp;rev DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="903"/>
+        <source>&amp;Next DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="911"/>
+        <source>&amp;Select Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <source>&amp;About Subsurface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="937"/>
+        <source>&amp;Globe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="953"/>
+        <source>&amp;Import Log Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="959"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="707"/>
-        <source>Export &amp;UDDF</source>
-        <translation>匯出 UDDF</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="1008"/>
+        <source>&amp;Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1011"/>
+        <source>Export Dive Logs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="1014"/>
+        <source>Ctrl+E</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="138"/>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Enable the pN2 Graph</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <location filename="../qt-ui/mainwindow.ui" line="128"/>
         <source>Enable the pHe graph</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="300"/>
+        <location filename="../qt-ui/mainwindow.ui" line="290"/>
         <source>Show/hide heart rate</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <location filename="../qt-ui/mainwindow.ui" line="342"/>
         <source>Enable EAD, END, and EADD</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="238"/>
         <source>Show NDL / TTS</source>
         <translation>顯示NDL/TTS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="456"/>
+        <location filename="../qt-ui/mainwindow.ui" line="394"/>
         <source>Rescale depth axis</source>
         <translation>重新調節深度坐標軸</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="710"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="715"/>
-        <source>Export HTML World Map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="718"/>
-        <source>Ctrl+H</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="723"/>
+        <location filename="../qt-ui/mainwindow.ui" line="780"/>
         <source>&amp;Print</source>
         <translation>列印</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="734"/>
+        <location filename="../qt-ui/mainwindow.ui" line="791"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="742"/>
+        <location filename="../qt-ui/mainwindow.ui" line="799"/>
         <source>&amp;Quit</source>
         <translation>結束</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="753"/>
+        <location filename="../qt-ui/mainwindow.ui" line="810"/>
         <source>Import from &amp;dive computer</source>
         <translation>從潛水電腦匯入</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="818"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation>自 Subsurface 服務匯入 GPS 資料</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="764"/>
+        <location filename="../qt-ui/mainwindow.ui" line="821"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="826"/>
         <source>&amp;Edit Device Names</source>
         <translation>編輯裝置名稱</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="834"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="782"/>
+        <location filename="../qt-ui/mainwindow.ui" line="839"/>
         <source>&amp;Renumber</source>
         <translation>重新編號</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="785"/>
+        <location filename="../qt-ui/mainwindow.ui" line="842"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="798"/>
+        <location filename="../qt-ui/mainwindow.ui" line="855"/>
         <source>&amp;Yearly Statistics</source>
         <translation>年統計</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="801"/>
+        <location filename="../qt-ui/mainwindow.ui" line="858"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="806"/>
-        <source>Dive List</source>
-        <translation>潛水列表</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="814"/>
-        <source>Profile</source>
-        <translation>資訊</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="822"/>
-        <source>Info</source>
-        <translation>資訊</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="830"/>
-        <source>All</source>
-        <translation>全部</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="872"/>
+        <location filename="../qt-ui/mainwindow.ui" line="929"/>
         <source>User &amp;Manual</source>
         <translation>使用者說明</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="880"/>
-        <source>Globe</source>
-        <translation>地圖位置</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="888"/>
+        <location filename="../qt-ui/mainwindow.ui" line="945"/>
         <source>P&amp;lan Dive</source>
         <translation>計畫潛水</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="891"/>
+        <location filename="../qt-ui/mainwindow.ui" line="948"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="907"/>
-        <source>Import from Divelogs.de</source>
-        <translation>自 Divelogs.de 匯入</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <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="951"/>
-        <source>Export CSV</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="726"/>
+        <location filename="../qt-ui/mainwindow.ui" line="783"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</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>啓用pO2圖</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>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="316"/>
         <source>Enable MOD</source>
         <translation>啓用MOD</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>顯示DC上限返匯</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>顯示計算的上限</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>顯示計算深度以3米為增量</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>計算所有組織</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>顯示SAC率</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>啓動/關閉標尺</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="731"/>
-        <source>Preferences</source>
-        <translation>環境設定</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="745"/>
+        <location filename="../qt-ui/mainwindow.ui" line="802"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="756"/>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="774"/>
-        <source>Add Dive</source>
-        <translation>增加潛水</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="793"/>
-        <source>Auto Group</source>
-        <translation>增加群組</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="809"/>
+        <location filename="../qt-ui/mainwindow.ui" line="866"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="817"/>
+        <location filename="../qt-ui/mainwindow.ui" line="874"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <location filename="../qt-ui/mainwindow.ui" line="882"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="833"/>
+        <location filename="../qt-ui/mainwindow.ui" line="890"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="838"/>
-        <source>Prev DC</source>
-        <translation>上一個 DC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="841"/>
+        <location filename="../qt-ui/mainwindow.ui" line="898"/>
         <source>Left</source>
         <translation>左邊</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="846"/>
-        <source>Next DC</source>
-        <translation>下一個 DC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="849"/>
+        <location filename="../qt-ui/mainwindow.ui" line="906"/>
         <source>Right</source>
         <translation>右邊</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="854"/>
-        <source>Select Events</source>
-        <translation>選擇事件</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="859"/>
+        <location filename="../qt-ui/mainwindow.ui" line="916"/>
         <source>Input Plan</source>
         <translation>輸入計畫</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="864"/>
-        <source>About Subsurface</source>
-        <translation>關於 Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="875"/>
+        <location filename="../qt-ui/mainwindow.ui" line="932"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="883"/>
+        <location filename="../qt-ui/mainwindow.ui" line="940"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="896"/>
-        <source>Import Log Files</source>
-        <translation>導入檔案文件</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="899"/>
+        <location filename="../qt-ui/mainwindow.ui" line="956"/>
         <source>Import divelog files from other applications</source>
         <translation>從其他程序導入潛水檔案文件</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="915"/>
+        <location filename="../qt-ui/mainwindow.ui" line="964"/>
+        <source>Import &amp;from Divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="972"/>
         <source>&amp;Full Screen</source>
         <translation>&amp;全屏顯示</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>觸發全屏顯示</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="921"/>
+        <location filename="../qt-ui/mainwindow.ui" line="978"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="174"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
         <source>Open File</source>
         <translation>開啟檔案</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>在關閉檔案前, 請儲存或取消此次潛水的編輯.</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>
-        <translation>在開始計畫潛水前, 請先儲存或取消此次潛水的編輯.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="396"/>
+        <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>在新增潛水前, 請先儲存或取消此次潛水的編輯.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="645"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="419"/>
+        <source>Print runtime table</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="710"/>
         <source>Do you want to save the changes you made in the file %1?</source>
         <translation>您是否要對檔案 %1 所做的修改儲存?</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>您是否要對資料檔案所做的修改進行儲存?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="652"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="717"/>
         <source>Save Changes?</source>
         <translation>儲存變更?</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>如果不進行儲存, 所做變更將會遺失.</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>另存新檔</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>提醒</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>在開啟新檔前, 請儲存或取消此次潛水的編輯.</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>UDDF 檔案 (*.uddf *.UDDF)</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>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="300"/>
-        <source>HTML files (*.html)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="449"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="514"/>
         <source>Yearly Statistics</source>
         <translation>年統計</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="961"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1076"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML 檔案 (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1199"/>
         <source>Open Dive Log File</source>
         <translation>打開潛水檔案文件</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1084"/>
+        <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>潛水檔案文件(*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML 文件 (*.xml);;UDDF/UDCF 文件(*.uddf *.udcf);;JDiveLog 文件(*.jlb);;Suunto 文件(*.sde *.db);;CSV 文件(*.csv);;所有文件(*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1107"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1225"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>請在嘗試其他編輯時先完成當前編輯</translation>
     </message>
 </context>
 <context>
+    <name>PlannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Last stop at 20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="416"/>
+        <source>Last stop at 6m</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>PreferencesDialog</name>
     <message>
         <location filename="../qt-ui/preferences.ui" line="85"/>
@@ -1827,247 +1928,297 @@ Please, remove them first.</source>
         <translation>語言</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="151"/>
         <source>Lists and Tables</source>
         <translation>列表與表單</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font</source>
         <translation>字型</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="167"/>
         <source>Font size</source>
         <translation>字體大小</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="170"/>
+        <location filename="../qt-ui/preferences.ui" line="180"/>
         <source>Dives</source>
         <translation>潛水</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>預設潛水檔案</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="188"/>
+        <location filename="../qt-ui/preferences.ui" line="198"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="197"/>
+        <location filename="../qt-ui/preferences.ui" line="207"/>
         <source>Display Invalid</source>
         <translation>顯示無效</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="214"/>
+        <location filename="../qt-ui/preferences.ui" line="224"/>
         <source>Default Cylinder</source>
         <translation>預設氣瓶</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>使用的預設氣瓶</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="237"/>
+        <location filename="../qt-ui/preferences.ui" line="247"/>
         <source>Animations</source>
         <translation>動畫演示</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="243"/>
+        <location filename="../qt-ui/preferences.ui" line="253"/>
         <source>Speed</source>
         <translation>速度</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <source>Clear all settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="312"/>
+        <source>Reset all settings to their default value</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
         <source>System</source>
         <translation>系統</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="323"/>
+        <location filename="../qt-ui/preferences.ui" line="348"/>
         <source>Metric</source>
         <translation>公制</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="333"/>
+        <location filename="../qt-ui/preferences.ui" line="358"/>
         <source>Imperial</source>
         <translation>英制</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="343"/>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
         <source>Personalize</source>
         <translation>個人化</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="367"/>
+        <location filename="../qt-ui/preferences.ui" line="392"/>
         <source>Depth</source>
         <translation>深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="374"/>
+        <location filename="../qt-ui/preferences.ui" line="399"/>
         <source>meter</source>
         <translation>meter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="384"/>
+        <location filename="../qt-ui/preferences.ui" line="409"/>
         <source>feet</source>
         <translation>feet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="401"/>
+        <location filename="../qt-ui/preferences.ui" line="426"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="411"/>
+        <location filename="../qt-ui/preferences.ui" line="436"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="428"/>
+        <location filename="../qt-ui/preferences.ui" line="453"/>
         <source>liter</source>
         <translation>liter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="438"/>
+        <location filename="../qt-ui/preferences.ui" line="463"/>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="455"/>
+        <location filename="../qt-ui/preferences.ui" line="480"/>
         <source>celsius</source>
         <translation>攝氏</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="465"/>
+        <location filename="../qt-ui/preferences.ui" line="490"/>
         <source>fahrenheit</source>
         <translation>華氏</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="482"/>
+        <location filename="../qt-ui/preferences.ui" line="507"/>
         <source>kg</source>
         <translation>kg</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>顯示pO2界限</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>顯示pN2界限</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>顯示pHe界限</translation>
     </message>
-    <message utf8="true">
-        <location filename="../qt-ui/preferences.ui" line="636"/>
-        <source>max ppO₂ when showing MOD</source>
-        <translation>顯示MOD最大ppO2</translation>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="811"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="817"/>
+        <source>Proxy type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="830"/>
+        <source>Host</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="856"/>
+        <source>Port</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="882"/>
+        <source>Requires authentication</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
+        <source>Username</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="657"/>
+        <location filename="../qt-ui/preferences.ui" line="925"/>
+        <source>Password</source>
+        <translation>密碼</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="682"/>
         <source>draw dive computer reported ceiling red</source>
         <translation>畫出潛水設備回報的警戒深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="747"/>
+        <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>System Default</source>
         <translation>系統預設</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="767"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>Filter</source>
         <translation>篩選器</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../qt-ui/preferences.ui" line="419"/>
         <source>Pressure</source>
         <translation>壓力</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="421"/>
+        <location filename="../qt-ui/preferences.ui" line="446"/>
         <source>Volume</source>
         <translation>容量</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="448"/>
+        <location filename="../qt-ui/preferences.ui" line="473"/>
         <source>Temperature</source>
         <translation>溫度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="475"/>
+        <location filename="../qt-ui/preferences.ui" line="500"/>
         <source>Weight</source>
         <translation>重量</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="517"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="507"/>
+        <location filename="../qt-ui/preferences.ui" line="532"/>
         <source>Time units</source>
         <translation>時間單位</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>上升/下降速度單位</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="520"/>
+        <location filename="../qt-ui/preferences.ui" line="545"/>
         <source>Minutes</source>
         <translation>分</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="530"/>
+        <location filename="../qt-ui/preferences.ui" line="555"/>
         <source>Seconds</source>
         <translation>秒</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="562"/>
+        <location filename="../qt-ui/preferences.ui" line="587"/>
         <source>Show</source>
         <translation>顯示</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="693"/>
         <source>Show non-used cylinders in Equipment Tab</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>最大深度的 GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="691"/>
+        <location filename="../qt-ui/preferences.ui" line="716"/>
         <source>Misc</source>
         <translation>其它</translation>
     </message>
@@ -2077,35 +2228,65 @@ Please, remove them first.</source>
         <translation>環境設定</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="697"/>
+        <location filename="../qt-ui/preferences.ui" line="722"/>
         <source>GFLow</source>
         <translation>GFlow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="739"/>
         <source>GFHigh</source>
         <translation>GFhigh</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="24"/>
+        <source>System proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="25"/>
+        <source>HTTP proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="26"/>
+        <source>SOCKS proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="245"/>
         <source>Restart required</source>
         <translation>需要重新啟動</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>您必須重新啟動 Subsurface 來正確載入新的語言</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>開啟預設的日誌檔案</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>Subsurface XML 檔案 (*.ssrf *.xml *.XML)</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="394"/>
+        <source>Warning</source>
+        <translation>提醒</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"/>
+    </message>
 </context>
 <context>
     <name>PrintDialog</name>
@@ -2246,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>未知</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>潛水 #%1 - %2</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>最大深度: %1 %2</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>區間: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1918"/>
+        <location filename="../qt-ui/models.cpp" line="1898"/>
         <source>Gas Used:</source>
         <translation>消耗氣體: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1920"/>
+        <location filename="../qt-ui/models.cpp" line="1900"/>
         <source>SAC:</source>
         <translation>耗氣率: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1922"/>
+        <location filename="../qt-ui/models.cpp" line="1902"/>
         <source>Max. CNS:</source>
         <translation>最大 CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1924"/>
+        <location filename="../qt-ui/models.cpp" line="1904"/>
         <source>Weights:</source>
         <translation>配重:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1929"/>
+        <location filename="../qt-ui/models.cpp" line="1909"/>
         <source>Notes:</source>
         <translation>記錄:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1936"/>
+        <location filename="../qt-ui/models.cpp" line="1916"/>
         <source>Divemaster:</source>
         <translation>導潛:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1938"/>
+        <location filename="../qt-ui/models.cpp" line="1918"/>
         <source>Buddy:</source>
         <translation>潛伴:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1940"/>
+        <location filename="../qt-ui/models.cpp" line="1920"/>
         <source>Suit:</source>
         <translation>防寒衣：</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1942"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>Viz:</source>
         <translation>Viz:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1944"/>
+        <location filename="../qt-ui/models.cpp" line="1924"/>
         <source>Rating:</source>
         <translation>評分:</translation>
     </message>
@@ -2319,75 +2500,90 @@ 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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/>
+        <source>Make first divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="906"/>
+        <source>Delete this divecomputer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="913"/>
         <source>Add Gas Change</source>
         <translation>增加氣瓶交換</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>增加書籤</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>移除事件</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>隱藏相似事件</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>
+        <translation type="unfinished"/>
     </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>取消隱藏所有事件</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>隱藏事件</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>隱藏所有 %1 事件?</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>移除所選擇的事件？</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>%1 @ %2:%3</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>空氣</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>移除此點</translation>
     </message>
@@ -2397,22 +2593,22 @@ Please, remove them first.</source>
         <translation>關閉</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="34"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
         <source>Average</source>
         <translation>平均</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="37"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
         <translation>最低</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="40"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Maximum</source>
         <translation>最高</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>在地圖上移動, 並且雙擊來設定潛水位置</translation>
     </message>
@@ -2426,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>新的開始編號</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/simplewidgets.cpp" line="126"/>
+        <source>New number</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchBar</name>
+    <message>
+        <location filename="../qt-ui/searchbar.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ShiftImageTimesDialog</name>
@@ -2443,42 +2653,47 @@ Please, remove them first.</source>
         <translation>移動圖片的時間根據</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="102"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="95"/>
+        <source>h:mm</source>
+        <translation>h:mm</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="105"/>
         <source>earlier</source>
         <translation>較早</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="109"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="112"/>
         <source>later</source>
         <translation>較晚</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>
+        <translation type="unfinished"/>
     </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>選擇攝像頭時間差</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>選擇潛水機器時間顯示圖片</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>哪個日期和時間將會被顯示在圖片上?</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>打開圖片文件</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>圖片文件類型(*.jpg*.jpeg*.pnm*.tif*.tiff）</translation>
     </message>
@@ -2498,18 +2713,18 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="72"/>
         <source>Shifted time:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="79"/>
         <source>Current time:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="86"/>
         <location filename="../qt-ui/shifttimes.ui" line="93"/>
         <source>0:0</source>
-        <translation type="unfinished">0:0</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="126"/>
@@ -2558,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>網頁服務</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/>
         <source>Connecting...</source>
         <translation>連結...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="421"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="419"/>
         <source>Download finished</source>
         <translation>下載結束</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>下載失敗: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/>
         <source>Connection Error: </source>
         <translation>連結錯誤:</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>錯誤的使用者 Id !</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>回覆無法解析!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/>
         <source>Download Success!</source>
         <translation>下載成功!</translation>
     </message>
@@ -2609,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>描述</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="852"/>
+        <location filename="../qt-ui/models.cpp" line="850"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2627,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>資訊</translation>
     </message>
@@ -2635,68 +2850,206 @@ 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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="37"/>
-        <source>&lt;h3&gt;Subsurface was unable to check for updates.&lt;/h3&gt;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="36"/>
+        <source>Subsurface was unable to check for updates.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
-        <source>&lt;br/&gt;&lt;b&gt;The following error occurred:&lt;/b&gt;&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="41"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="43"/>
-        <source>&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Please check your internet connection.&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="42"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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>使用者說明</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>無法找到 Subsurface 使用說明</translation>
     </message>
 </context>
 <context>
+    <name>UserSurvey</name>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="47"/>
+        <source>Subsurface User Survey</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="79"/>
+        <source>Recreational DIver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="92"/>
+        <source>Tech Diver</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="105"/>
+        <source>Interested in dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="118"/>
+        <source>I am downloading dives from supported dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="131"/>
+        <source>I am importing dives from other software / sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="144"/>
+        <source>I am manually entering dives</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.ui" line="190"/>
+        <source>Please type suggestions (in English) in the following box</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="27"/>
+        <source>
+Operating System: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="30"/>
+        <source>
+CPU Architecture: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="35"/>
+        <source>
+OS CPU Architecture %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="39"/>
+        <source>
+Language: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="73"/>
+        <source>Should we ask you later?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="74"/>
+        <source>Don&apos;t ask me again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="75"/>
+        <source>Ask Later</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="76"/>
+        <source>Ask again?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <source>Submit User Survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <source>Subsurface was unable to submit the user survey.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="101"/>
+        <source>The following error occurred:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="102"/>
+        <source>Please check your internet connection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="111"/>
+        <source>Survey successfully submitted.</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </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>描述</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="723"/>
+        <location filename="../qt-ui/models.cpp" line="721"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2731,7 +3084,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/webservices.ui" line="85"/>
         <source>Save User ID locally?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="92"/>
@@ -2744,12 +3097,12 @@ Please, remove them first.</source>
         <translation>上傳</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>操作時間結束</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="279"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="277"/>
         <source>Transfering data...</source>
         <translation>移轉資料...</translation>
     </message>
@@ -2757,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>類型</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="368"/>
+        <location filename="../qt-ui/models.cpp" line="373"/>
         <source>Weight</source>
         <translation>重量</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>按此處移除配重系統</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="453"/>
+        <location filename="../qt-ui/models.cpp" line="458"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="454"/>
+        <location filename="../qt-ui/models.cpp" line="459"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="478"/>
+        <location filename="../qt-ui/models.cpp" line="483"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="479"/>
+        <location filename="../qt-ui/models.cpp" line="484"/>
         <source>m</source>
         <translation>m</translation>
     </message>
@@ -2795,79 +3148,79 @@ 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>年 
  &gt; 月 / 旅程</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1643"/>
         <source>Duration 
  Total</source>
         <translation>區間 
 全部</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1646"/>
         <source>
 Average</source>
         <translation>
 平均</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>
 Shortest</source>
         <translation>
 最短</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>
 Longest</source>
         <translation>
 最長</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>深度 (%1)
 平均</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>
 最小</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>
 最大</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>耗氣率 (%1)
 平均</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>溫度 (%1)
@@ -2877,99 +3230,92 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="58"/>
+        <location filename="../dive.c" line="87"/>
         <source>pascal</source>
         <translation>pascal</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>bar</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>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="104"/>
-        <location filename="../qt-gui.cpp" line="292"/>
-        <source>l</source>
-        <translation>l</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>cuft</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>m</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>ft</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>lbs</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>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1120"/>
+        <location filename="../dive.c" line="1237"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) 或 (%s)</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>air</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="170"/>
+        <location filename="../equipment.c" line="210"/>
         <source>integrated</source>
         <translation>整合型</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="171"/>
+        <location filename="../equipment.c" line="211"/>
         <source>belt</source>
         <translation>配重帶</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="172"/>
+        <location filename="../equipment.c" line="212"/>
         <source>ankle</source>
         <translation>腳踝</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="173"/>
+        <location filename="../equipment.c" line="213"/>
         <source>backplate weight</source>
         <translation>背板配重</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="174"/>
+        <location filename="../equipment.c" line="214"/>
         <source>clip-on</source>
         <translation>吊掛式</translation>
     </message>
@@ -2986,823 +3332,865 @@ Maximum</source>
         <translation>CSV 匯入最大支援 %d 欄位.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>none</source>
         <translation>無</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>deco stop</source>
         <translation>減壓停留</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ascent</source>
         <translation>上升</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>ceiling</source>
         <translation>深度</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="141"/>
+        <location filename="../libdivecomputer.c" line="144"/>
         <source>workload</source>
         <translation>工作量</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>transmitter</source>
         <translation>發射器</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>violation</source>
         <translation>違反</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>bookmark</source>
         <translation>書籤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>surface</source>
         <translation>水面</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="145"/>
         <source>safety stop</source>
         <translation>安全停留</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>氣瓶更換</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (voluntary)</source>
         <translation>安全停留 (非必要)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="143"/>
+        <location filename="../libdivecomputer.c" line="146"/>
         <source>safety stop (mandatory)</source>
         <translation>安全停留 (強制性)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>deepstop</source>
         <translation>深停留</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>ceiling (safety stop)</source>
         <translation>深度 (安全停留)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="147"/>
         <source>divetime</source>
         <translation>潛水時間</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>below floor</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>maxdepth</source>
         <translation>最大深度</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>airtime</source>
         <translation>空氣時間</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="148"/>
         <source>heading</source>
         <translation>標題</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>tissue level warning</source>
         <translation>組織等級警告</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="149"/>
         <source>non stop time</source>
         <translation>無停留時間</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="163"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>invalid event number</source>
         <translation>錯誤的事件編號</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>無法建立解析 %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="411"/>
+        <location filename="../libdivecomputer.c" line="414"/>
         <source>Error registering the data</source>
         <translation>錯誤的登錄資料</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="419"/>
+        <location filename="../libdivecomputer.c" line="422"/>
         <source>Error parsing the datetime</source>
         <translation>日期時間解析錯誤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="438"/>
         <source>Dive %d: %s %d %04d</source>
         <translation>潛水 %d: %s %d %04d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="440"/>
+        <location filename="../libdivecomputer.c" line="443"/>
         <source>Error parsing the divetime</source>
         <translation>潛水時間解析錯誤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="449"/>
+        <location filename="../libdivecomputer.c" line="452"/>
         <source>Error parsing the maxdepth</source>
         <translation>最大深度解析錯誤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="458"/>
+        <location filename="../libdivecomputer.c" line="461"/>
         <source>Error parsing the gas mix count</source>
         <translation>混合氣體數量解析錯誤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="470"/>
+        <location filename="../libdivecomputer.c" line="473"/>
         <source>Error obtaining water salinity</source>
         <translation>得到錯誤的海水鹽度</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="478"/>
+        <location filename="../libdivecomputer.c" line="481"/>
         <source>Error obtaining surface pressure</source>
         <translation>得到錯誤的水面壓力</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="489"/>
         <source>Error parsing the gas mix</source>
         <translation>混合氣體解析錯誤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="493"/>
+        <location filename="../libdivecomputer.c" line="496"/>
         <source>Error parsing the samples</source>
         <translation>樣本解析錯誤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="623"/>
+        <location filename="../libdivecomputer.c" line="626"/>
         <source>Event: waiting for user action</source>
         <translation>事件: 等待使用者動作</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>型號=%u (0x%08x), 韌體=%u (0x%08x), 序號=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="691"/>
+        <location filename="../libdivecomputer.c" line="694"/>
         <source>Error registering the event handler.</source>
         <translation>錯誤的註冊程序.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="696"/>
+        <location filename="../libdivecomputer.c" line="699"/>
         <source>Error registering the cancellation handler.</source>
         <translation>錯誤的註冊取消程序.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="717"/>
+        <location filename="../libdivecomputer.c" line="720"/>
         <source>Dive data import error</source>
         <translation>匯入潛水資料錯誤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="756"/>
+        <location filename="../libdivecomputer.c" line="759"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>無法建立 libdivecomputer 上下文</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="763"/>
+        <location filename="../libdivecomputer.c" line="766"/>
         <source>Unable to open %s %s (%s)</source>
         <translation> 無法開啟 %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="462"/>
+        <location filename="../parse-xml.c" line="466"/>
         <source>Strange percentage reading %s
 </source>
         <translation>有問題的讀取比例 %s
 </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>無法解析訊息 &apos;%s&apos;</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>資料庫讀取 get_events 失敗.
 </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>數據庫請求get_tags失敗</translation>
     </message>
     <message>
         <location filename="../file.c" line="166"/>
-        <source>Database connection failed &apos;%s&apos;.
+        <source>Database connection failed '%s'.
 </source>
         <translation>資料庫連結錯誤 &apos;%s&apos; .
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1887"/>
-        <location filename="../parse-xml.c" line="2034"/>
-        <source>Database query failed &apos;%s&apos;.
+        <location filename="../parse-xml.c" line="1945"/>
+        <location filename="../parse-xml.c" line="2092"/>
+        <source>Database query failed '%s'.
 </source>
         <translation>資料庫要求錯誤 &apos;%s&apos; .
 </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>無法開啟樣式 %s</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>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="146"/>
-        <location filename="../planner.c" line="617"/>
-        <source>Can&apos;t find gas %d/%d</source>
-        <translation>無法找到氣源 %d/%d</translation>
+        <location filename="../planner.c" line="159"/>
+        <location filename="../planner.c" line="752"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="308"/>
+        <location filename="../planner.c" line="345"/>
         <source>Too many gas mixes</source>
         <translation>太多氣體混合</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="489"/>
-        <source>%s
-Subsurface dive plan
-based on GFlow = %.0f and GFhigh = %.0f
-
-</source>
-        <translation>%s
-Subsurface 潛水計畫
-以 GFlow = %.0f 和 GFhigh = %.0f 為基礎
-
-</translation>
+        <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>免責聲明 / 警告: 這是使用新發展的 BUHLMANN 演算法, 且使用的潛水計畫僅經過有限次數的測試. 我們強烈建議不要直接使用此處模擬結果做為計畫.  </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="530"/>
-        <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>禁搭飛機 %.*f %s 在 %d:%02d min - 運行時間 %d:%02u 在 %s
-</translation>
+        <location filename="../planner.c" line="535"/>
+        <source>based on GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="539"/>
-        <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
-</source>
-        <translation>在 %.*f %s 停留 %d:%02d min - 時間運行 %d:%02u 於 %s
-</translation>
+        <location filename="../planner.c" line="538"/>
+        <source>Subsurface dive plan</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="550"/>
-        <source>Switch gas to %s
-</source>
-        <translation>更換氣體至 %s
-</translation>
+        <location filename="../planner.c" line="542"/>
+        <source>depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="558"/>
-        <source>Gas consumption:
-</source>
-        <translation>氣體消耗:
-</translation>
+        <location filename="../planner.c" line="545"/>
+        <source>runtime</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="569"/>
-        <source>%.0f%s of %s
-</source>
-        <translation>%.0f%s of %s
-</translation>
+        <location filename="../planner.c" line="548"/>
+        <source>duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="551"/>
+        <source>gas</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="606"/>
+        <source>%3.0f%s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
+        <source>%3dmin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="629"/>
+        <source>Switch gas to %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="638"/>
+        <source>Gas consumption:</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="659"/>
+        <source>this is more gas than available in the specified cylinder!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="810"/>
+        <location filename="../planner.c" line="664"/>
+        <source>not enough reserve for gas sharing on ascent!</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="668"/>
+        <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="980"/>
         <source>ean</source>
         <translation>ean</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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1229"/>
+        <location filename="../profile.c" line="1253"/>
         <source>P: %d%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1233"/>
+        <location filename="../profile.c" line="1257"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1239"/>
+        <location filename="../profile.c" line="1263"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s</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>SAC: %2.1fl/分鐘</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1244"/>
+        <location filename="../profile.c" line="1268"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1246"/>
+        <location filename="../profile.c" line="1270"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1248"/>
+        <location filename="../profile.c" line="1272"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="1274"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="1277"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s</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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1276"/>
+        <location filename="../profile.c" line="1300"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="1308"/>
         <source>Deco: %umin @ %.0f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1291"/>
+        <location filename="../profile.c" line="1315"/>
         <source>In deco
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1293"/>
+        <location filename="../profile.c" line="1317"/>
         <source>NDL: %umin
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1305"/>
+        <location filename="../profile.c" line="1329"/>
         <source>In deco (calc)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1307"/>
+        <location filename="../profile.c" line="1331"/>
         <source>NDL: %umin (calc)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1310"/>
+        <location filename="../profile.c" line="1334"/>
         <source>TTS: %umin (calc)
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1313"/>
+        <location filename="../profile.c" line="1337"/>
         <source>Calculated ceiling %.0f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1319"/>
+        <location filename="../profile.c" line="1343"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1325"/>
+        <location filename="../profile.c" line="1349"/>
         <source>heartbeat: %d
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1327"/>
+        <location filename="../profile.c" line="1351"/>
         <source>bearing: %d
 </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1419"/>
+        <location filename="../profile.c" line="1443"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</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>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1435"/>
+        <location filename="../profile.c" line="1459"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1439"/>
+        <location filename="../profile.c" line="1463"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</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>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1454"/>
+        <location filename="../profile.c" line="1478"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="273"/>
+        <location filename="../qt-gui.cpp" line="281"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="276"/>
+        <location filename="../qt-gui.cpp" line="284"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="392"/>
-        <source>%1, %2 %3, %4 %5:%6</source>
-        <translation>%1, %2 %3, %4 %5:%6</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="405"/>
-        <source>%1 %2, %3
-%4:%5</source>
-        <translation>%1 %2, %3
-%4:%5</translation>
-    </message>
-    <message>
-        <location filename="../qt-gui.cpp" line="418"/>
+        <location filename="../qt-gui.cpp" line="417"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 潛水)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="423"/>
+        <location filename="../qt-gui.cpp" line="422"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 潛水)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>boat</source>
         <translation>船潛</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>shore</source>
         <translation>岸潛</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="14"/>
+        <location filename="../dive.c" line="19"/>
         <source>drift</source>
         <translation>放流</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>deep</source>
         <translation>深潛</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>cavern</source>
         <translation>地洞</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="15"/>
+        <location filename="../dive.c" line="20"/>
         <source>ice</source>
         <translation>冰潛</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>wreck</source>
         <translation>沈船</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>cave</source>
         <translation>洞穴</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="16"/>
+        <location filename="../dive.c" line="21"/>
         <source>altitude</source>
         <translation>高海拔</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>pool</source>
         <translation>泳池</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>lake</source>
         <translation>湖泊</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="17"/>
+        <location filename="../dive.c" line="22"/>
         <source>river</source>
         <translation>河流</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>night</source>
         <translation>夜潛</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>fresh</source>
         <translation>新進</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="18"/>
+        <location filename="../dive.c" line="23"/>
         <source>student</source>
         <translation>學生</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>photo</source>
         <translation>照片</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>video</source>
         <translation>影片</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="24"/>
         <source>instructor</source>
         <translation>教練</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="25"/>
         <source>deco</source>
         <translation>減壓</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="216"/>
+        <location filename="../dive.c" line="133"/>
+        <source>ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="214"/>
         <source>more than %d days</source>
         <translation>超過 %d日</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="220"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="224"/>
+        <location filename="../statistics.c" line="222"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="235"/>
+        <location filename="../statistics.c" line="234"/>
         <source>for dives #</source>
         <translation>針對潛水 #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="242"/>
+        <location filename="../statistics.c" line="240"/>
         <source>for selected dives</source>
         <translation>針對選擇的潛水</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="275"/>
         <source>for dive #%d</source>
         <translation>針對潛水 #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="277"/>
         <source>for selected dive</source>
         <translation>針對選擇的潛水</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for all dives</source>
         <translation>針對所有潛水</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="283"/>
+        <location filename="../statistics.c" line="281"/>
         <source>(no dives)</source>
         <translation>(無潛水)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sun</source>
         <translation>周日</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Mon</source>
         <translation>周一</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Tue</source>
         <translation>周二</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Wed</source>
         <translation>周三</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Thu</source>
         <translation>周四</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Fri</source>
         <translation>周五</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="65"/>
+        <location filename="../subsurfacestartup.c" line="75"/>
         <source>Sat</source>
         <translation>周六</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jan</source>
         <translation>1月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Feb</source>
         <translation>2月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Mar</source>
         <translation>3月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Apr</source>
         <translation>4月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>May</source>
         <translation>5月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="74"/>
+        <location filename="../subsurfacestartup.c" line="84"/>
         <source>Jun</source>
         <translation>6月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Jul</source>
         <translation>7月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Aug</source>
         <translation>8月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Sep</source>
         <translation>9月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Oct</source>
         <translation>10月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Nov</source>
         <translation>11月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="75"/>
+        <location filename="../subsurfacestartup.c" line="85"/>
         <source>Dec</source>
         <translation>12月</translation>
     </message>
@@ -3832,97 +4220,97 @@ Is the Uemis Zurich plugged in correctly?</source>
 請確認 Uemis Zurich 是否正確連接?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="107"/>
+        <location filename="../uemis-downloader.c" line="111"/>
         <source>unknown</source>
         <translation>未知</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="379"/>
+        <location filename="../uemis-downloader.c" line="383"/>
         <source>Reading %s %s</source>
         <translation>讀取 %s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="399"/>
+        <location filename="../uemis-downloader.c" line="403"/>
         <source>data</source>
         <translation>資料</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="420"/>
+        <location filename="../uemis-downloader.c" line="424"/>
         <source>divelog entry id</source>
         <translation>潛水記錄連結 id</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="422"/>
+        <location filename="../uemis-downloader.c" line="426"/>
         <source>divespot data id</source>
         <translation>潛點資料 id</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
+        <location filename="../uemis-downloader.c" line="428"/>
         <source>more data dive id</source>
         <translation>更多潛水記錄, 潛水編號 </translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>wetsuit</source>
         <translation>濕式防寒衣</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>semidry</source>
         <translation>半乾衣</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="618"/>
+        <location filename="../uemis-downloader.c" line="622"/>
         <source>drysuit</source>
         <translation>乾式防寒衣</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>shorty</source>
         <translation>短袖防寒衣</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>vest</source>
         <translation>背心</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>long john</source>
         <translation>長約翰式</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>jacket</source>
         <translation>夾克式</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>full suit</source>
         <translation>全身式防寒衣</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="619"/>
+        <location filename="../uemis-downloader.c" line="623"/>
         <source>2 pcs full suit</source>
         <translation>2 件式防寒衣</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="620"/>
+        <location filename="../uemis-downloader.c" line="624"/>
         <source>membrane</source>
         <translation>膜組織</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="802"/>
+        <location filename="../uemis-downloader.c" line="823"/>
         <source>Init Communication</source>
         <translation>初始化通訊</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="804"/>
+        <location filename="../uemis-downloader.c" line="825"/>
         <source>Uemis init failed</source>
         <translation>Uemis 初始化失敗</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="815"/>
+        <location filename="../uemis-downloader.c" line="836"/>
         <source>Start download</source>
         <translation>開始下載</translation>
     </message>
@@ -3943,18 +4331,18 @@ Is the Uemis Zurich plugged in correctly?</source>
     </message>
     <message>
         <location filename="../uemis.c" line="203"/>
-        <source>PO2 Green Warning</source>
-        <translation>PO2 提醒</translation>
+        <source>pO₂ Green Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
-        <source>PO2 Ascend Warning</source>
-        <translation>PO2 上升提醒</translation>
+        <source>pO₂ Ascend Warning</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="208"/>
-        <source>PO2 Ascend Alarm</source>
-        <translation>PO2 上升警告</translation>
+        <source>pO₂ Ascend Alarm</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../uemis.c" line="212"/>
@@ -4016,5 +4404,214 @@ Is the Uemis Zurich plugged in correctly?</source>
         <source>Low Battery Alert</source>
         <translation>電池低電量警示</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"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="36"/>
+        <source>Date:</source>
+        <translation>日期:</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="38"/>
+        <source>Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="40"/>
+        <source>Duration:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="41"/>
+        <source>min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="43"/>
+        <source>Max Depth:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="46"/>
+        <source>Air Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="48"/>
+        <source>Water Temp:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="50"/>
+        <source>Location:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../worldmap-save.c" line="54"/>
+        <source>Notes:</source>
+        <translation>記錄:</translation>
+    </message>
+</context>
+<context>
+    <name>plannerSettingsWidget</name>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="35"/>
+        <source>Rates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="56"/>
+        <source>Ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="77"/>
+        <source>below 75% avg. depth</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="94"/>
+        <source>75%-50% avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="111"/>
+        <source>50% avg. depth - 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="128"/>
+        <source>6m/20ft to surface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="148"/>
+        <source>Descent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="200"/>
+        <source>surface to the bottom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="226"/>
+        <source>Planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="247"/>
+        <source>GF low</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="264"/>
+        <source>GF high</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
+        <source>Drop to first depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
+        <source>Last Stop at 6m/20ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>plan backgas breaks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="318"/>
+        <source>Gas Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <source>bottom SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="349"/>
+        <source>deco SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="359"/>
+        <source>bottom pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="389"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="382"/>
+        <source>deco pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="421"/>
+        <source>Dive Notes</source>
+        <translation>潛水記錄</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="445"/>
+        <source>display runtime</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="458"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="461"/>
+        <source>display segment duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="471"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="474"/>
+        <source>display transitions in deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="481"/>
+        <source>verbatim diveplan</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file